Fixed a crash when unchecking share this player. Also trying to make the

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 4c2ed2c..fbeae9d 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -14,7 +14,6 @@
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
-- (void)showCurrentTrackInfo;
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
@@ -291,6 +290,9 @@ static MainController *sharedController;
 {
     if ([networkController isConnectedToServer]) {
         [statusItem setMenu:[menuController menu]];
+        if ([[networkController networkObject] remote] == nil) {
+            [self networkError:nil];
+        }
     }
     
     if ( [self songChanged] && (timerUpdating != YES) ) {
@@ -998,7 +1000,7 @@ static MainController *sharedController;
     if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
         ITDebugLog(@"Remote server found.");
         [timer invalidate];
-        if (![networkController isConnectedToServer]) {
+        if (![networkController isServerOn] && ![networkController isConnectedToServer]) {
             [[StatusWindowController sharedController] showReconnectQueryWindow];
         }
     } else {