Send channel topics on initial burst, sync chanels after db load, and try to after unserializing persist on

1 files changed, 6 insertions, 3 deletions

diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp
index 463318436..9db73decf 100644
--- a/modules/commands/cs_set.cpp
+++ b/modules/commands/cs_set.cpp
@@ -511,6 +511,8 @@ class CommandCSSetPersist : public Command
 						ChannelStatus status(BotModes());
 						ci->bi->Join(c, &status);
 					}
+					if (created)
+						c->Sync();
 				}
 
 				/* Set the perm mode */
@@ -1165,14 +1167,15 @@ class CSSet : public Module
 				if (ChanServ)
 					ChanServ->Assign(NULL, ci);
 			}
-			if (!ci->bi)
-				return;
 
-			if (!c->FindUser(ci->bi))
+			if (ci->bi && !c->FindUser(ci->bi))
 			{
 				ChannelStatus status(BotModes());
 				ci->bi->Join(c, &status);
 			}
+
+			if (created)
+				c->Sync();
 		}
 	} persist;