Made it so that the stupid client DISCONNECTS, with the side effect of

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 4c2ed2c..3c1cb6c 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -14,7 +14,6 @@
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;

-- (void)showCurrentTrackInfo;

 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
 - (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 isConnectedToServer]) {
         [statusItem setMenu:[menuController menu]];

+        if ([[networkController networkObject] remote] == nil) {
+            [self networkError:nil];
+        }

     }
     
     if ( [self songChanged] && (timerUpdating != YES) ) {
     }
     
     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 checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
         ITDebugLog(@"Remote server found.");
         [timer invalidate];

-        if (![networkController isConnectedToServer]) {
+        if (![networkController isServerOn] && ![networkController isConnectedToServer]) {

             [[StatusWindowController sharedController] showReconnectQueryWindow];
         }
     } else {
             [[StatusWindowController sharedController] showReconnectQueryWindow];
         }
     } else {


@@ -1009,8 +1011,7 @@ static MainController *sharedController;
 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);

-    NSLog(@"%@", [exception reason]);
-    if ([[exception name] isEqualToString:NSPortTimeoutException] && [networkController isConnectedToServer]) {
+    if ( ((exception == nil) || [[exception name] isEqualToString:NSPortTimeoutException]) && [networkController isConnectedToServer]) {

         NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
         if ([self disconnectFromServer]) {
             [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
         NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
         if ([self disconnectFromServer]) {
             [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];