Use the source's sync state and not mine when processing sjoins to determine whether or not to sync the channel on creation, instead sync it when the server syncs.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/messages.cpp b/src/messages.cpp
index 0e7d03ce1..8dc962cfd 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -145,10 +145,10 @@ void Join::SJoin(MessageSource &source, const Anope::string &chan, time_t ts, co
 	/* Channel is done syncing */
 	if (c->syncing)
 	{
-		c->syncing = false;
 		/* Sync the channel (mode lock, topic, etc) */
 		/* the channel is synced when the netmerge is complete */
-		if (Me && Me->IsSynced())
+		Server *src = source.GetServer() ? source.GetServer() : Me;
+		if (src && src->IsSynced())
 			c->Sync();
 	}
 }