From: Kent Sutherland <ksuther@ithinksw.com>
Date: Fri, 28 Nov 2003 21:25:46 +0000 (+0000)
Subject: Fixed networking problems, hopefully.
X-Git-Tag: v1.2~23
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/c9a21871b37d415af1d0723715c43bbfae86c25a

Fixed networking problems, hopefully.
---

diff --git a/MainController.m b/MainController.m
index 065659a..4c2ed2c 100755
--- a/MainController.m
+++ b/MainController.m
@@ -960,6 +960,12 @@ static MainController *sharedController;
     if (result == 1) {
         [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
         currentRemote = [[[networkController networkObject] remote] retain];
+        [refreshTimer invalidate];
+        refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
+                                target:self
+                                selector:@selector(timerUpdate)
+                                userInfo:nil
+                                repeats:YES] retain];
         [self timerUpdate];
         ITDebugLog(@"Connection successful.");
         return 1;
diff --git a/NetworkController.m b/NetworkController.m
index 7bdcac2..24e8264 100755
--- a/NetworkController.m
+++ b/NetworkController.m
@@ -83,6 +83,7 @@ static NetworkController *sharedController;
             [serverConnection release];
             [serverPort release];
             ITDebugLog(@"Error starting server!");
+            return;
         NS_ENDHANDLER
         ITDebugLog(@"Started server.");
         if (!name) {
@@ -102,6 +103,7 @@ static NetworkController *sharedController;
         }
         [service publish];
         serverOn = YES;
+        ITDebugLog(@"Server service published.");
     } else if (serverOn && !status && [serverConnection isValid]) {
         //Turn off
         [service stop];
@@ -133,11 +135,12 @@ static NetworkController *sharedController;
         clientConnection = [[NSConnection connectionWithReceivePort:nil sendPort:clientPort] retain];
         [clientConnection setReplyTimeout:5];
         clientProxy = [[clientConnection rootProxy] retain];
+        connectedToServer = YES;
     NS_HANDLER
         [clientConnection release];
         [clientPort release];
         ITDebugLog(@"Connection to host failed: %@", host);
-        return NO;
+        return 0;
     NS_ENDHANDLER
     
     if (!clientProxy) {
@@ -172,7 +175,6 @@ static NetworkController *sharedController;
     
     ITDebugLog(@"Connected to host: %@", host);
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(disconnect) name:NSConnectionDidDieNotification object:clientConnection];
-    connectedToServer = YES;
     return 1;
 }
 
@@ -282,7 +284,6 @@ static NetworkController *sharedController;
 - (void)netServiceDidResolveAddress:(NSNetService *)sender
 {
     ITDebugLog(@"Resolved service named %@.", [sender name]);
-//  NSLog(@"Resolved service named %@.", [sender name]);
     [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];
     [sender stop];
 }
diff --git a/libValidate.a b/libValidate.a
index ca66985..b921fb5 100755
Binary files a/libValidate.a and b/libValidate.a differ