Fix DelMode failing on modes using the default ParamChannelModeHandler::OnModeChange

1 files changed, 7 insertions, 5 deletions

diff --git a/src/mode.cpp b/src/mode.cpp
index 979413730..448c4e358 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -170,13 +170,15 @@ ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Chan
 
 ModeAction ParamChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
-	if (adding && !ParamValidate(parameter))
-		return MODEACTION_DENY;
-	std::string now = channel->GetModeParameter(this);
-	if (parameter == now)
-		return MODEACTION_DENY;
 	if (adding)
+	{
+		std::string now = channel->GetModeParameter(this);
+		if (parameter == now)
+			return MODEACTION_DENY;
+		if (!ParamValidate(parameter))
+			return MODEACTION_DENY;
 		channel->SetModeParam(this, parameter);
+	}
 	else
 		channel->SetModeParam(this, "");
 	return MODEACTION_ALLOW;