(trunk libT) when we can't bind to a port and the error is EADDRINUSE, add a parenthe...

diff --git a/libtransmission/net.c b/libtransmission/net.c
index 1a0652d54038ca4ad32c61b6fa986d05dccdd31f..678c6220f6983e6848753fee0f5bc29ad81f3c6a 100644 (file)
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -352,8 +352,22 @@ tr_netBindTCPImpl( const tr_address * addr, tr_port port, tr_bool suppressMsgs,
     if( bind( fd, (struct sockaddr *) &sock, addrlen ) ) {
         const int err = sockerrno;
         if( !suppressMsgs )
-            tr_err( _( "Couldn't bind port %d on %s: %s" ),
-                    port, tr_ntop_non_ts( addr ), tr_strerror( err ) );
+        {
+            const char * fmt;
+            const char * hint;
+
+            if( err == EADDRINUSE )
+                hint = _( "Is another copy of Transmission already running?" );
+            else
+                hint = NULL;
+
+            if( hint == NULL )
+                fmt = _( "Couldn't bind port %d on %s: %s" );
+            else
+                fmt = _( "Couldn't bind port %d on %s: %s (%s)" );
+            
+            tr_err( fmt, port, tr_ntop_non_ts( addr ), tr_strerror( err ), hint );
+        }
         tr_netCloseSocket( fd );
         *errOut = err;
         return -1;