diff options
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 072634253..27e186b83 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -85,13 +85,17 @@ void Channel::Reset() for (ChanUserList::const_iterator it = this->users.begin(), it_end = this->users.end(); it != it_end; ++it) this->SetCorrectModes(it->second->user, true); - this->Sync(); + // If the channel is syncing now, do not force a sync due to Reset(), as we are probably iterating over users in Message::SJoin + // A sync will come soon + if (!syncing) + this->Sync(); } void Channel::Sync() { syncing = false; FOREACH_MOD(OnChannelSync, (this)); + CheckModes(); } void Channel::CheckModes() |