X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/1241f4136652ac9629457a83953d8f8bf3889bdd..b9f80a08cfcd969efa302d34796c1f101acf6d44:/MainController.m

diff --git a/MainController.m b/MainController.m
index c2acaf1..b2b8195 100755
--- a/MainController.m
+++ b/MainController.m
@@ -33,7 +33,6 @@
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
-- (void)checkForRemoteServer;
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
@@ -778,7 +777,19 @@ static MainController *sharedController;
     NS_ENDHANDLER
     
     if ( title ) {
-
+        if ( [df boolForKey:@"showAlbumArtwork"] ) {
+	    NSSize oldSize, newSize;
+             NS_DURING
+		 art = [[self currentRemote] currentSongAlbumArt];
+		 oldSize = [art size];
+		 if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
+		 else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
+                art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
+        }
+        
         if ( [df boolForKey:@"showAlbum"] ) {
             NS_DURING
                 album = [[self currentRemote] currentSongAlbum];
@@ -844,20 +855,6 @@ static MainController *sharedController;
                 rating = ( currentRating * 5 );
             }
         }
-        
-        if ( [df boolForKey:@"showAlbumArtwork"] ) {
-	    NSSize oldSize, newSize;
-             NS_DURING
-		 art = [[self currentRemote] currentSongAlbumArt];
-		 oldSize = [art size];
-		 if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
-		 else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
-                art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
-            NS_HANDLER
-                [self networkError:localException];
-            NS_ENDHANDLER
-        }
-        
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }
@@ -1169,10 +1166,11 @@ static MainController *sharedController;
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
     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);
+        //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);
+        [[StatusWindowController sharedController] showNetworkErrorQueryWindow];
         if ([self disconnectFromServer]) {
             [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
-            [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:YES];
+            [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
         } else {
             ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
         }
@@ -1182,7 +1180,7 @@ static MainController *sharedController;
 - (void)reconnect
 {
     if ([self connectToServer] == 0) {
-        [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:YES];
+        [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
     }
     [[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];