summaryrefslogtreecommitdiff
path: root/src/command_parse.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/command_parse.cpp')
-rw-r--r--src/command_parse.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index f7d57daf9..e371e8810 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -402,15 +402,12 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
MOD_RESULT = 0;
FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, true, cmd));
if (MOD_RESULT == 1)
- return do_more;
+ return do_more && !user->quitting;
- /*
- * WARNING: be careful, the user may be deleted soon
- */
CmdResult result = cm->second->Handle(command_p, user);
FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd));
- return do_more;
+ return do_more && !user->quitting;
}
}