Merge branch 'restart-jump' into next

* restart-jump:
  * Initialize irc module when disconnecting from server if in the middle of a restart

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -9,6 +9,7 @@
 * When 'mdop' protection is on, re-op all previously opped clients automatically.
 * When 'mop' protection is on, deop all previously regular clients automatically.
 * Fix 'mop' causing a mass deop when -bitch
+* Fix bot going zombie if it jumps during a restart
 
 * Fix crash related to slowpart
 * Properly honor exemptions when kicking matched RBL clients

src/mod/server.mod/servmsg.c

@@ -1274,6 +1274,7 @@ static int gotmode(char *from, char *msg)
 }
 
 static void end_burstmode();
+void irc_init();
 
 static void disconnect_server(int idx, int dolost)
 {
@@ -1309,6 +1310,8 @@ static void disconnect_server(int idx, int dolost)
     lostdcc(idx);
   }
   end_burstmode();
+  if (reset_chans == 2)
+    irc_init();
   reset_chans = 0;
   keepnick = 1;
   /* Invalidate the cmd_swhois cache callback data */