The status item is disabled while the menu is being updated

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 6937a6f..a8c28d0 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -326,9 +326,10 @@ static MainController *sharedController;
 
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier
 {
 
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier
 {

-    ITDebugLog(@"Setting latest song identifier to %@", newIdentifier);
+    ITDebugLog(@"Setting latest song identifier:");
+    ITDebugLog(@"   - Identifier: %@", newIdentifier);

     [_latestSongIdentifier autorelease];
     [_latestSongIdentifier autorelease];

-    _latestSongIdentifier = [newIdentifier copy];
+    _latestSongIdentifier = [newIdentifier retain];

 }
 
 - (void)timerUpdate
 }
 
 - (void)timerUpdate


@@ -357,6 +358,7 @@ static MainController *sharedController;
         }
         
         timerUpdating = YES;
         }
         
         timerUpdating = YES;

+        [_statusItem setEnabled:NO];

         
         NS_DURING
             latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
         
         NS_DURING
             latestPlaylistClass = [[self currentRemote] currentPlaylistClass];


@@ -390,6 +392,7 @@ static MainController *sharedController;
         NS_ENDHANDLER
         
         timerUpdating = NO;
         NS_ENDHANDLER
         
         timerUpdating = NO;

+        [_statusItem setEnabled:YES];

     }
 }
 
     }
 }
 


@@ -628,7 +631,7 @@ static MainController *sharedController;
     ITHotKey *hotKey;
     ITDebugLog(@"Setting up hot keys.");
     
     ITHotKey *hotKey;
     ITDebugLog(@"Setting up hot keys.");
     

-    if (playerRunningState == ITMTRemotePlayerNotRunning) {
+    if (playerRunningState == ITMTRemotePlayerNotRunning && ![[NetworkController sharedController] isConnectedToServer]) {

         return;
     }
     
         return;
     }
     


@@ -766,6 +769,8 @@ static MainController *sharedController;
     NSImage                *art         = nil;
     int                     rating      = -1;
     
     NSImage                *art         = nil;
     int                     rating      = -1;
     

+    ITDebugLog(@"Showing track info status window.");
+    

     NS_DURING
         source      = [[self currentRemote] currentSource];
         title       = [[self currentRemote] currentSongTitle];
     NS_DURING
         source      = [[self currentRemote] currentSource];
         title       = [[self currentRemote] currentSongTitle];


@@ -773,8 +778,6 @@ static MainController *sharedController;
         [self networkError:localException];
     NS_ENDHANDLER
     
         [self networkError:localException];
     NS_ENDHANDLER
     

-    ITDebugLog(@"Showing track info status window.");
-    

     if ( title ) {
 
         if ( [df boolForKey:@"showAlbum"] ) {
     if ( title ) {
 
         if ( [df boolForKey:@"showAlbum"] ) {


@@ -859,6 +862,7 @@ static MainController *sharedController;
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }

+    ITDebugLog(@"Showing current track info status window.");

     [statusWindowController showSongInfoWindowWithSource:source
                                                    title:title
                                                    album:album
     [statusWindowController showSongInfoWindowWithSource:source
                                                    title:title
                                                    album:album