diff options
| author |  Attila Molnar | 2015-02-24 22:30:45 +0100 |
|---|---|---|
| committer | Attila Molnar | 2015-02-24 22:30:45 +0100 |
| commit | c85a46ff97c03b28bfb54578c5ff851f47af8419 (patch) | |
| tree | 9431dbdb5149ba4086745f19c89d673c3cbb64ea /src/userprocess.cpp | |
| parent | Merge pull request #992 from SaberUK/insp20+fix-error-message (diff) | |
| parent | Fix a minor crash when a user has no class after OnCheckReady. (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.
Diffstat (limited to 'src/userprocess.cpp')
| -rw-r--r-- | src/userprocess.cpp | 7 |
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 |