Skip to content

Commit 74048c0

Browse files
author
Michael Gorbach
committed
Fix the freeze
1 parent b752447 commit 74048c0

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

MFClient.m

+3
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ - (void)fillInitialStatus {
156156
- (BOOL)establishCommunication {
157157
// Set up DO
158158
connection = [NSConnection connectionWithRegisteredName:kMFDistributedObjectName host:nil];
159+
[connection setRequestTimeout:5.0f];
160+
[connection setReplyTimeout:5.0f];
161+
159162
id serverObject = [connection rootProxy];
160163
[serverObject setProtocolForProxy:@protocol(MFServerProtocol)];
161164
server = (id <MFServerProtocol>)serverObject;

MFCommunicationServer.h

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
@interface MFCommunicationServer : NSObject <MFServerProtocol> {
2323
NSError *_recentError;
2424
NSMutableArray *_clients;
25+
NSConnection *_doConnection;
2526
}
2627

2728
+ (MFCommunicationServer *)sharedServer;

MFCommunicationServer.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ - (id) init {
5757
}
5858

5959
- (void)vendDisributedObject {
60-
NSConnection *connection = [NSConnection new];
61-
[connection setRootObject:self];
62-
if ([connection registerName:kMFDistributedObjectName] == YES) {
60+
_doConnection = [NSConnection new];
61+
[_doConnection setRootObject:self];
62+
if ([_doConnection registerName:kMFDistributedObjectName]) {
6363
} else {
6464
MFLogS(self, @"Failed to register connection name");
6565
exit(-1);

MacFusion2.xcodeproj/project.pbxproj

-16
Original file line numberDiff line numberDiff line change
@@ -1863,10 +1863,6 @@
18631863
buildSettings = {
18641864
COPY_PHASE_STRIP = YES;
18651865
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1866-
FRAMEWORK_SEARCH_PATHS = (
1867-
"$(inherited)",
1868-
"\"$(SRCROOT)/../Build/Debug\"",
1869-
);
18701866
GCC_ENABLE_FIX_AND_CONTINUE = NO;
18711867
GCC_ENABLE_OBJC_GC = required;
18721868
GCC_MODEL_TUNING = G5;
@@ -2142,10 +2138,6 @@
21422138
buildSettings = {
21432139
COPY_PHASE_STRIP = YES;
21442140
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
2145-
FRAMEWORK_SEARCH_PATHS = (
2146-
"$(inherited)",
2147-
"\"$(SRCROOT)/../Build/Debug\"",
2148-
);
21492141
GCC_ENABLE_FIX_AND_CONTINUE = NO;
21502142
GCC_ENABLE_OBJC_GC = required;
21512143
GCC_MODEL_TUNING = G5;
@@ -2327,10 +2319,6 @@
23272319
buildSettings = {
23282320
COPY_PHASE_STRIP = YES;
23292321
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
2330-
FRAMEWORK_SEARCH_PATHS = (
2331-
"$(inherited)",
2332-
"\"$(SRCROOT)/../Build/Debug\"",
2333-
);
23342322
GCC_ENABLE_FIX_AND_CONTINUE = NO;
23352323
GCC_ENABLE_OBJC_GC = required;
23362324
GCC_MODEL_TUNING = G5;
@@ -2652,10 +2640,6 @@
26522640
buildSettings = {
26532641
COPY_PHASE_STRIP = YES;
26542642
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
2655-
FRAMEWORK_SEARCH_PATHS = (
2656-
"$(inherited)",
2657-
"\"$(SRCROOT)/../Build/Debug\"",
2658-
);
26592643
GCC_ENABLE_FIX_AND_CONTINUE = NO;
26602644
GCC_ENABLE_OBJC_GC = required;
26612645
GCC_MODEL_TUNING = G5;

0 commit comments

Comments
 (0)