summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2015-02-24 22:30:45 +0100
committerAttila Molnar <attilamolnar@hush.com>2015-02-24 22:30:45 +0100
commitc85a46ff97c03b28bfb54578c5ff851f47af8419 (patch)
tree9431dbdb5149ba4086745f19c89d673c3cbb64ea
parentd3124462f23cc1aa72357919199be026458f160a (diff)
parent81841f76c863844210baf991d5c8cdfd01e57353 (diff)
Merge pull request #1002 from SaberUK/insp20+fix-cgiirc-crash
[2.0] Fix a minor crash when a user has no class after OnCheckReady.
-rw-r--r--src/userprocess.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 0ef95e413..69c31f840 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -104,10 +104,15 @@ void InspIRCd::DoBackgroundUserStuff()
curr->FullConnect();
continue;
}
+
+ // If the user has been quit in OnCheckReady then we shouldn't
+ // quit them again for having a registration timeout.
+ if (curr->quitting)
+ continue;
break;
}
- if (curr->registered != REG_ALL && (Time() > (curr->signon + curr->MyClass->GetRegTimeout())))
+ if (curr->registered != REG_ALL && curr->MyClass && (Time() > (curr->signon + curr->MyClass->GetRegTimeout())))
{
/*
* registration timeout -- didnt send USER/NICK/HOST