summaryrefslogtreecommitdiff
path: root/src/messages.cpp
diff options
context:
space:
mode:
authorDukePyrolator <DukePyrolator@anope.org>2013-05-12 11:09:34 +0200
committerDukePyrolator <DukePyrolator@anope.org>2013-05-12 11:09:34 +0200
commit4237d49d41caca771b9d82439b4ce145f151b504 (patch)
tree00168b476b2f81a7dc38649a356cc7c69eda431e /src/messages.cpp
parent1c36de5ab150d43b9caf377a409d71f857288509 (diff)
improved handling of mlocks and topiclocks on inspircd
Diffstat (limited to 'src/messages.cpp')
-rw-r--r--src/messages.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/messages.cpp b/src/messages.cpp
index ed601a206..1c7b956d1 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -147,7 +147,9 @@ void Join::SJoin(MessageSource &source, const Anope::string &chan, time_t ts, co
{
c->Shrink("SYNCING");
/* Sync the channel (mode lock, topic, etc) */
- c->Sync();
+ /* the channel is synced when the netmerge is complete */
+ if (Me && Me->IsSynced())
+ c->Sync();
}
}