From 6a9f6c32367d1555fdf904696794589e98849525 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Wed, 7 Feb 2007 05:32:16 +0000
Subject: [PATCH] use actual port used when checking the status

---
 macosx/PrefsController.m | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 4f2ae53dc..2ce9c80f3 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -261,8 +261,9 @@
                                         "Preferences -> Network -> port status") stringByAppendingEllipsis]];
     [fPortStatusImage setImage: nil];
     [fPortStatusProgress startAnimation: self];
-        
-    [portChecker probePort: [fDefaults integerForKey: @"BindPort"]];
+    
+    tr_handle_status_t * stat = tr_handleStatus(fHandle);
+    [portChecker probePort: stat->publicPort];
 }
 
 - (void) portCheckerDidFinishProbing: (PortChecker *) portChecker
@@ -299,18 +300,18 @@
 
 - (void) updateNatStatus
 {
-    tr_handle_status_t * hstat = tr_handleStatus(fHandle);
-    if (fNatStatus == hstat->natTraversalStatus)
+    tr_handle_status_t * stat = tr_handleStatus(fHandle);
+    if (fNatStatus == stat->natTraversalStatus)
         return;
-    fNatStatus = hstat->natTraversalStatus;
+    fNatStatus = stat->natTraversalStatus;
     
-    if (hstat->natTraversalStatus == TR_NAT_TRAVERSAL_MAPPED)
+    if (fNatStatus == TR_NAT_TRAVERSAL_MAPPED)
     {
         [fNatStatusField setStringValue: NSLocalizedString(@"Port successfully mapped",
                                             "Preferences -> Network -> port map status")];
         [fNatStatusImage setImage: [NSImage imageNamed: @"GreenDot.tiff"]];
     }
-    else if (hstat->natTraversalStatus == TR_NAT_TRAVERSAL_NOTFOUND || hstat->natTraversalStatus == TR_NAT_TRAVERSAL_ERROR)
+    else if (fNatStatus == TR_NAT_TRAVERSAL_NOTFOUND || fNatStatus == TR_NAT_TRAVERSAL_ERROR)
     {
         [fNatStatusField setStringValue: NSLocalizedString(@"Error mapping port",
                                             "Preferences -> Network -> port map status")];