Do not delay port checking if port forwarding is disabled

diff --git a/macosx/PortChecker.h b/macosx/PortChecker.h
index ad5db3c1075e84319e5672f74d0bc9f65cf212fb..48ad443d9190ca59ddd4dd683a4221d3816013b6 100644 (file)
--- a/macosx/PortChecker.h
+++ b/macosx/PortChecker.h
@@ -44,7 +44,7 @@ typedef enum
     NSTimer * fTimer;
 }
 
-- (id) initForPort: (int) portNumber withDelegate: (id) delegate;
+- (id) initForPort: (int) portNumber delay: (BOOL) delay withDelegate: (id) delegate;
 - (void) cancelProbe;
 
 - (void) callBackWithStatus: (port_status_t) status;

diff --git a/macosx/PortChecker.m b/macosx/PortChecker.m
index 3f8c9c490824cda0bd0f585780b98db867fde540..bd5af77a072a96f818ded0a6e978aaa073d8951f 100644 (file)
--- a/macosx/PortChecker.m
+++ b/macosx/PortChecker.m
@@ -30,7 +30,7 @@
 
 @implementation PortChecker
 
-- (id) initForPort: (int) portNumber withDelegate: (id) delegate
+- (id) initForPort: (int) portNumber delay: (BOOL) delay withDelegate: (id) delegate
 {
     if ((self = [super init]))
     {
@@ -39,8 +39,8 @@
         fPortNumber = portNumber;
         fStatus = PORT_STATUS_CHECKING;
         
-        fTimer = [NSTimer scheduledTimerWithTimeInterval: CHECK_FIRE target: self selector: @selector(startProbe)
-                    userInfo: nil repeats: NO];
+        fTimer = [NSTimer scheduledTimerWithTimeInterval: (delay ? CHECK_FIRE : 0.1) target: self
+                    selector: @selector(startProbe) userInfo: nil repeats: NO];
     }
     
     return self;

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 507fe535ac71ba2b0b20a337331cdd13ed2a8fd4..e7dd23d47b40f03fc9a6ac2fe9dac0da08d782bc 100644 (file)
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -365,7 +365,8 @@ tr_handle * fHandle;
             [fPortChecker cancelProbe];
             [fPortChecker release];
         }
-        fPortChecker = [[PortChecker alloc] initForPort: fPeerPort withDelegate: self];
+        fPortChecker = [[PortChecker alloc] initForPort: fPeerPort
+            delay: tr_sessionIsPortForwardingEnabled(fHandle) withDelegate: self];
     }
 }