Changes in ipc.c [e67e513:4c225f0]

File:

• ipc.c (modified) (4 diffs)

ipc.c

@@ -356 +356 @@
                         irc_switch_fd( irc, ipc_child_recv_fd );
                         irc_sync( irc );
-                        irc_rootmsg( irc, "You've successfully taken over your old session" );
+                        irc_usermsg( irc, "You've successfully taken over your old session" );
                         ipc_child_recv_fd = -1;
                         
@@ -374 +374 @@
         {
                 /* Master->New connection */
-                irc_rootmsg( irc, "Could not take over old session" );
+                irc_usermsg( irc, "Could not take over old session" );
         }
 }
@@ -412 +412 @@
         /* Drop credentials, we'll shut down soon and shouldn't overwrite
            any settings. */
-        irc_rootmsg( irc, "Trying to take over existing session" );
+        irc_usermsg( irc, "Trying to take over existing session" );
         
         irc_desync( irc );
@@ -909 +909 @@
         int serversock;
 
+        if (!IPCSOCKET || !*IPCSOCKET)
+                return 1;
+
         /* Clean up old socket files that were hanging around.. */
         if (unlink(IPCSOCKET) == -1 && errno != ENOENT) {