X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/aeae287077a886690921baaea0a0f1149bc891db..7b7de4d405e383f18d69341f0f7459e4b3db35c4:/MainController.m

diff --git a/MainController.m b/MainController.m
index 3c1cb6c..afc0db2 100755
--- a/MainController.m
+++ b/MainController.m
@@ -55,6 +55,13 @@ static MainController *sharedController;
         SetITDebugMode(YES);
     }
     
+    if (([df integerForKey:@"appVersion"] < 1200) && ([df integerForKey:@"SongsInAdvance"] > 0)) {
+        [df removePersistentDomainForName:@"com.ithinksw.menutunes"];
+        [df synchronize];
+        [[PreferencesController sharedPrefs] registerDefaults];
+        [[StatusWindowController sharedController] showPreferencesUpdateWindow];
+    }
+    
     currentRemote = [self loadRemote];
     [[self currentRemote] begin];
     
@@ -290,12 +297,9 @@ static MainController *sharedController;
 {
     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) && (playerRunningState == ITMTRemotePlayerRunning) ) {
         ITDebugLog(@"The song changed.");
         timerUpdating = YES;
         
@@ -409,6 +413,7 @@ static MainController *sharedController;
 {
     ITDebugLog(@"Selecting playlist %i", index);
     NS_DURING
+        //[[self currentRemote] switchToPlaylistAtIndex:(index % 1000) ofSourceAtIndex:(index / 1000)];
         [[self currentRemote] switchToPlaylistAtIndex:index];
     NS_HANDLER
         [self networkError:localException];
@@ -478,6 +483,15 @@ static MainController *sharedController;
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
+- (void)showPreferencesAndClose
+{
+    ITDebugLog(@"Show preferences.");
+    [[PreferencesController sharedPrefs] showPrefsWindow:self];
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+}
+
 - (void)showTestWindow
 {
     [self showCurrentTrackInfo];
@@ -502,6 +516,10 @@ static MainController *sharedController;
 
 - (ITMTRemote *)currentRemote
 {
+    if ([networkController isConnectedToServer] && ![[networkController networkObject] isValid]) {
+        [self networkError:nil];
+        return nil;
+    }
     return currentRemote;
 }
 
@@ -1071,12 +1089,12 @@ static MainController *sharedController;
     NS_DURING
         if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) {
             ITDebugLog(@"Remote application terminated.");
+            playerRunningState = ITMTRemotePlayerNotRunning;
             [[self currentRemote] halt];
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
             [self clearHotKeys];
-            playerRunningState = ITMTRemotePlayerNotRunning;
             
             if ([df objectForKey:@"ShowPlayer"] != nil) {
                 ITHotKey *hotKey;