From ceb65233f7ffd73c2fd3b471d7e15ab7abefb553 Mon Sep 17 00:00:00 2001
From: Kent Sutherland <ksuther@ithinksw.com>
Date: Wed, 1 Oct 2003 18:20:33 +0000
Subject: [PATCH] Fixed the hotkeys so they don't run even when they shouldn't
 (player no running, rating not changable)

---
 MainController.m |  17 +++++++++++++++++
 MenuController.m |   3 ++-
 libValidate.a    | Bin 8032 -> 8032 bytes
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/MainController.m b/MainController.m
index e6d338b..36212c4 100755
--- a/MainController.m
+++ b/MainController.m
@@ -371,6 +371,11 @@ static MainController *sharedController;
 {
     ITHotKey *hotKey;
     ITDebugLog(@"Setting up hot keys.");
+    
+    if (playerRunningState == ITMTRemotePlayerNotRunning) {
+        return;
+    }
+    
     if ([df objectForKey:@"PlayPause"] != nil) {
         ITDebugLog(@"Setting up play pause hot key.");
         hotKey = [[ITHotKey alloc] init];
@@ -620,6 +625,12 @@ static MainController *sharedController;
 {
     float rating = [currentRemote currentSongRating];
     ITDebugLog(@"Incrementing rating.");
+    
+    if ([currentRemote currentPlaylistIndex] == 0) {
+        ITDebugLog(@"No song playing, rating change aborted.");
+        return;
+    }
+    
     rating += 0.2;
     if (rating > 1.0) {
         rating = 1.0;
@@ -635,6 +646,12 @@ static MainController *sharedController;
 {
     float rating = [currentRemote currentSongRating];
     ITDebugLog(@"Decrementing rating.");
+    
+    if ([currentRemote currentPlaylistIndex] == 0) {
+        ITDebugLog(@"No song playing, rating change aborted.");
+        return;
+    }
+    
     rating -= 0.2;
     if (rating < 0.0) {
         rating = 0.0;
diff --git a/MenuController.m b/MenuController.m
index c157903..0d6fc63 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -220,6 +220,7 @@
                         [menu addItemWithTitle:title action:nil keyEquivalent:@""]];
                 }
                 
+                if (!_playingRadio) {
                     if ([defaults boolForKey:@"showAlbum"]) {
                         NSString *curAlbum = [currentRemote currentSongAlbum];
                         ITDebugLog(@"Add Track Album (\"%@\") menu item.", curAlbum);
@@ -277,7 +278,7 @@
                         ITDebugLog(@"Add Track Rating (\"%@\") menu item.", string);
                         [menu indentItem:[menu addItemWithTitle:string action:nil keyEquivalent:@""]];
                     }
-                
+                }
             } else {
                 ITDebugLog(@"No Track is Playing, Add \"No Song\" menu item.");
                 [menu addItemWithTitle:NSLocalizedString(@"noSong", @"No Song") action:NULL keyEquivalent:@""];
diff --git a/libValidate.a b/libValidate.a
index f06af690d8d18f6ae26ec0ef1ea351f5bdcad968..ac5a5361ca1d04fdb1a4a8c7cb7c4ad997373664 100755
GIT binary patch
delta 16
XcmaE0_rPv~EUU4Rv4O=#B|CWlGzJA9

delta 16
XcmaE0_rPv~EUS^FnT63tB|CWlG+YHL

-- 
2.20.1