From f2cd38f53e8a04284b9f6db3dbf704a96063d67d Mon Sep 17 00:00:00 2001
From: Kent Sutherland <ksuther@ithinksw.com>
Date: Thu, 11 Dec 2003 22:19:49 +0000
Subject: [PATCH] More toying with network stuff. Hopefully fixed more problems
 without making even more.

---
 MainController.m        |   7 ++++---
 NetworkController.h     |   1 +
 NetworkController.m     |  13 +++++++++++++
 PreferencesController.m |   1 +
 libValidate.a           | Bin 8032 -> 8032 bytes
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/MainController.m b/MainController.m
index 3c1cb6c..dafd199 100755
--- a/MainController.m
+++ b/MainController.m
@@ -290,9 +290,6 @@ static MainController *sharedController;
 {
     if ([networkController isConnectedToServer]) {
         [statusItem setMenu:[menuController menu]];
-        if ([[networkController networkObject] remote] == nil) {
-            [self networkError:nil];
-        }
     }
     
     if ( [self songChanged] && (timerUpdating != YES) ) {
@@ -502,6 +499,10 @@ static MainController *sharedController;
 
 - (ITMTRemote *)currentRemote
 {
+    if ([networkController isConnectedToServer] && ![[networkController networkObject] isValid]) {
+        [self networkError:nil];
+        return nil;
+    }
     return currentRemote;
 }
 
diff --git a/NetworkController.h b/NetworkController.h
index 57eee2e..62f221e 100755
--- a/NetworkController.h
+++ b/NetworkController.h
@@ -39,6 +39,7 @@
 - (int)connectToHost:(NSString *)host;
 - (BOOL)checkForServerAtHost:(NSString *)host;
 - (BOOL)disconnect;
+- (void)resetServerName;
 - (BOOL)isServerOn;
 - (BOOL)isClientConnected;
 - (BOOL)isConnectedToServer;
diff --git a/NetworkController.m b/NetworkController.m
index 6c9631c..f2989e3 100755
--- a/NetworkController.m
+++ b/NetworkController.m
@@ -111,6 +111,7 @@ static NetworkController *sharedController;
     } else if (serverOn && !status && [serverConnection isValid]) {
         //Turn off
         [service stop];
+        [service release];
         [rootObject invalidate];
         [serverConnection registerName:nil];
         [serverConnection invalidate];
@@ -240,6 +241,18 @@ static NetworkController *sharedController;
     return valid;
 }
 
+- (void)resetServerName
+{
+    if ([self isServerOn]) {
+        [service stop];
+        [service release];
+        service = [[NSNetService alloc] initWithDomain:@""
+                                        type:@"_mttp._tcp."
+                                        name:[[NSUserDefaults standardUserDefaults] stringForKey:@"sharedPlayerName"]
+                                        port:SERVER_PORT];
+    }
+}
+
 - (BOOL)isServerOn
 {
     return serverOn;
diff --git a/PreferencesController.m b/PreferencesController.m
index 6f18bc0..7bc3db8 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -244,6 +244,7 @@ static PreferencesController *prefs = nil;
         [controller setServerStatus:state]; //Set server status
     } else if ( [sender tag] == 5015 ) {
         [df setObject:[sender stringValue] forKey:@"sharedPlayerName"];
+        [[NetworkController sharedController] resetServerName];
     } else if ( [sender tag] == 5020 ) {
         [df setBool:SENDER_STATE forKey:@"enableSharingPassword"];
     } else if ( [sender tag] == 5030 ) {
diff --git a/libValidate.a b/libValidate.a
index eb23cd2eaa6361fd659c5b62e83dae6f155b786d..336b6570f68184de11d46177b4aa9f3b83cbeae9 100755
GIT binary patch
delta 17
YcmaE0_rPv~44a{afu)7vMkPCW068)RS^xk5

delta 17
YcmaE0_rPv~44Z+0sgbeCMkPCW06546O#lD@

-- 
2.20.1