git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a crash when unchecking share this player. Also trying to make the
[MenuTunes.git]
/
NetworkController.m
diff --git
a/NetworkController.m
b/NetworkController.m
index
49b8321
..
1d180c6
100755
(executable)
--- a/
NetworkController.m
+++ b/
NetworkController.m
@@
-112,7
+112,6
@@
static NetworkController *sharedController;
[service stop];
[serverConnection registerName:nil];
[serverConnection release];
[service stop];
[serverConnection registerName:nil];
[serverConnection release];
- [clientProxy release];
ITDebugLog(@"Stopped server.");
serverOn = NO;
}
ITDebugLog(@"Stopped server.");
serverOn = NO;
}
@@
-200,6
+199,7
@@
static NetworkController *sharedController;
NSConnection *testConnection;
NSSocketPort *testPort;
NetworkObject *tempProxy;
NSConnection *testConnection;
NSSocketPort *testPort;
NetworkObject *tempProxy;
+ BOOL valid;
ITDebugLog(@"Checking for shared remote at %@.", host);
if (fullPass) {
[fullPass getBytes:&buffer range:NSMakeRange(6, 4)];
ITDebugLog(@"Checking for shared remote at %@.", host);
if (fullPass) {
[fullPass getBytes:&buffer range:NSMakeRange(6, 4)];
@@
-216,6
+216,7
@@
static NetworkController *sharedController;
[testConnection setReplyTimeout:2];
tempProxy = (NetworkObject *)[testConnection rootProxy];
[tempProxy serverName];
[testConnection setReplyTimeout:2];
tempProxy = (NetworkObject *)[testConnection rootProxy];
[tempProxy serverName];
+ valid = [tempProxy isValid];
NS_HANDLER
ITDebugLog(@"Connection to host failed: %@", host);
[testConnection release];
NS_HANDLER
ITDebugLog(@"Connection to host failed: %@", host);
[testConnection release];
@@
-231,7
+232,7
@@
static NetworkController *sharedController;
}
[testConnection release];
[testPort release];
}
[testConnection release];
[testPort release];
- return
YES
;
+ return
valid
;
}
- (BOOL)isServerOn
}
- (BOOL)isServerOn