Skip to content

Commit 25aa71b

Browse files
authored
Merge pull request #26 from morozov/deadlock
Defer setServer until after fuse_init to fix startup deadlock
2 parents bda4e40 + 2fac548 commit 25aa71b

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

fusepb/models/Emulator.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ -(void) connectWithPorts:(NSArray *)portArray
186186
sendPort:[portArray objectAtIndex:1]];
187187
[serverConnection setRootObject:self];
188188
proxy_view = (id)[serverConnection rootProxy];
189-
[proxy_view setServer:self];
190189

191190
/* Load saved ROM paths before startup so the sandbox scope covers custom ROMs on relaunch. */
192191
read_config_file( &settings_current );
@@ -197,6 +196,8 @@ -(void) connectWithPorts:(NSArray *)portArray
197196
}
198197
[Emulator endROMScopedAccess:romURLs];
199198

199+
[proxy_view setServer:self];
200+
200201
while( !fuse_exiting ) {
201202
[[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode
202203
beforeDate:[NSDate distantFuture]];

0 commit comments

Comments
 (0)