Merge branch 'restart-jump' into maint

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

doc/UPDATES

@@ -9,6 +9,7 @@
 * Ignore 'pflog' interfaces in promisc
 * Fix buffer overflow in DCC
 * Fix problems with changing IP
+* Fix bot going zombie if it jumps during a restart
 
 1.3 - http://wraith.botpack.net/milestone/1.3
 * Binary / shell / startup changes

src/mod/server.mod/servmsg.c

@@ -1256,6 +1256,7 @@ static int gotmode(char *from, char *msg)
 }
 
 static void end_burstmode();
+void irc_init();
 
 static void disconnect_server(int idx, int dolost)
 {
@@ -1291,6 +1292,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 */