Should disable the status item when iTunes is locked.

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 40f50ce..8784dd1 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -357,7 +357,17 @@ static MainController *sharedController;
 
 - (void)timerUpdate
 {
 
 - (void)timerUpdate
 {

-    if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
+       if ([[self currentRemote] playerStateUniqueIdentifier] == nil) {
+               [statusItem setEnabled:NO];
+               [statusItem setToolTip:@"iTunes not responding."];
+               return;
+       } else if (![statusItem isEnabled]) {
+               [statusItem setEnabled:YES];
+               [statusItem setToolTip:_toolTip];
+               return;
+       }
+       
+       if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {

         ITDebugLog(@"The song changed.");
         if ([df boolForKey:@"runScripts"]) {
             NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
         ITDebugLog(@"The song changed.");
         if ([df boolForKey:@"runScripts"]) {
             NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];


@@ -392,16 +402,15 @@ static MainController *sharedController;
             if ( [df boolForKey:@"showToolTip"] ) {
                 NSString *artist = [[self currentRemote] currentSongArtist];
                 NSString *title = [[self currentRemote] currentSongTitle];
             if ( [df boolForKey:@"showToolTip"] ) {
                 NSString *artist = [[self currentRemote] currentSongArtist];
                 NSString *title = [[self currentRemote] currentSongTitle];

-                NSString *toolTip;

                 ITDebugLog(@"Creating status item tooltip.");
                 if (artist) {
                 ITDebugLog(@"Creating status item tooltip.");
                 if (artist) {

-                    toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+                    _toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];

                 } else if (title) {
                 } else if (title) {

-                    toolTip = title;
+                    _toolTip = title;

                 } else {
                 } else {

-                    toolTip = @"No Song Playing";
+                    _toolTip = @"No Song Playing";

                 }
                 }

-                [statusItem setToolTip:toolTip];
+                [statusItem setToolTip:_toolTip];

             } else {
                 [statusItem setToolTip:nil];
             }
             } else {
                 [statusItem setToolTip:nil];
             }