git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fixes on timeout poop
[MenuTunes.git]
/
MainController.m
diff --git
a/MainController.m
b/MainController.m
index
da07757
..
4eb7891
100755
(executable)
--- a/
MainController.m
+++ b/
MainController.m
@@
-11,6
+11,10
@@
#import "StatusWindowController.h"
#import "StatusItemHack.h"
#import "StatusWindowController.h"
#import "StatusItemHack.h"
+@interface NSMenu (MenuImpl)
+- (id)_menuImpl;
+@end
+
@interface NSCarbonMenuImpl:NSObject
{
NSMenu *_menu;
@interface NSCarbonMenuImpl:NSObject
{
NSMenu *_menu;
@@
-435,7
+439,7
@@
static MainController *sharedController;
{
ITDebugLog(@"Menu clicked.");
{
ITDebugLog(@"Menu clicked.");
- if (
[[self currentRemote] playerStateUniqueIdentifier] == nil
) {
+ if (
([[self currentRemote] playerStateUniqueIdentifier] == nil) && playerRunningState == ITMTRemotePlayerRunning
) {
if ([statusItem isEnabled]) {
[statusItem setToolTip:@"iTunes not responding."];
[self clearHotKeys];
if ([statusItem isEnabled]) {
[statusItem setToolTip:@"iTunes not responding."];
[self clearHotKeys];
@@
-1393,6
+1397,8
@@
static MainController *sharedController;
[refreshTimer invalidate];
[refreshTimer release];
refreshTimer = nil;
[refreshTimer invalidate];
[refreshTimer release];
refreshTimer = nil;
+ [statusItem setEnabled:YES];
+ [statusItem setToolTip:@"iTunes not running."];
[self clearHotKeys];
if ([df objectForKey:@"ShowPlayer"] != nil) {
[self clearHotKeys];
if ([df objectForKey:@"ShowPlayer"] != nil) {