Changes in irc.c [1195cec:4230221]

File:

• irc.c (modified) (3 diffs)

irc.c

@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
+#include "sock.h"
 #include "crypting.h"
 #include "ipc.h"
@@ -138 +139 @@
         set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
         set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc );
-        set_add( &irc->set, "auto_reconnect_delay", "300", set_eval_int, irc );
+        set_add( &irc->set, "auto_reconnect_delay", "5*3<900", set_eval_account_reconnect_delay, irc );
         set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
         set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
@@ -314 +315 @@
         g_free( irc );
         
-        if( global.conf->runmode == RUNMODE_INETD || global.conf->runmode == RUNMODE_FORKDAEMON )
+        if( global.conf->runmode == RUNMODE_INETD ||
+            global.conf->runmode == RUNMODE_FORKDAEMON ||
+            ( global.conf->runmode == RUNMODE_DAEMON &&
+              global.listen_socket == -1 &&
+              irc_connection_list == NULL ) )
                 b_main_quit();
 }