git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ITFoundation launch at login, but it doesn'ty work. Other small fixes for netwo...
[MenuTunes.git]
/
MainController.m
diff --git
a/MainController.m
b/MainController.m
index
4417228
..
ad6f2e1
100755
(executable)
--- a/
MainController.m
+++ b/
MainController.m
@@
-1093,7
+1093,8
@@
static MainController *sharedController;
currentRemote = [[[networkController networkObject] remote] retain];
[self setupHotKeys];
currentRemote = [[[networkController networkObject] remote] retain];
[self setupHotKeys];
- playerRunningState = ITMTRemotePlayerRunning;
+ //playerRunningState = ITMTRemotePlayerRunning;
+ playerRunningState = [[self currentRemote] playerRunningState];
[refreshTimer invalidate];
refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
[refreshTimer invalidate];
refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
@@
-1186,7
+1187,7
@@
static MainController *sharedController;
- (void)applicationLaunched:(NSNotification *)note
{
NS_DURING
- (void)applicationLaunched:(NSNotification *)note
{
NS_DURING
- if (!note ||
[[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]
) {
+ if (!note ||
([[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]] && ![[NetworkController sharedController] isConnectedToServer])
) {
ITDebugLog(@"Remote application launched.");
playerRunningState = ITMTRemotePlayerRunning;
[[self currentRemote] begin];
ITDebugLog(@"Remote application launched.");
playerRunningState = ITMTRemotePlayerRunning;
[[self currentRemote] begin];