Fixed potential deadlocks

Ninoh-FOX · Aug 12, 2023 · 3168e0e · 3168e0e
1 parent 7e6f1f8
commit 3168e0e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Cocoa/Document.m b/Cocoa/Document.m
@@ -125,6 +125,7 @@ @implementation Document
     void (^ volatile _pendingAtomicBlock)();
 
     NSDate *_fileModificationTime;
+    __weak NSThread *_emulationThread;
 }
 
 static void boot_rom_load(GB_gameboy_t *gb, GB_boot_rom_t type)
@@ -606,7 +607,7 @@ - (void) start
     }
     if (_running) return;
     _running = true;
-    [[[NSThread alloc] initWithTarget:self selector:@selector(run) object:nil] start];
+    [_emulationThread = [[NSThread alloc] initWithTarget:self selector:@selector(run) object:nil] start];
 }
 
 - (void) stop
@@ -1584,7 +1585,7 @@ - (void) writeMemory:(uint16_t)addr value:(uint8_t)value
     GB_write_memory(&_gb, addr, value);
 }
 
-- (void) performAtomicBlock: (void (^)())block
+- (void)performAtomicBlock: (void (^)())block
 {
     while (!GB_is_inited(&_gb));
     bool isRunning = _running && !GB_debugger_is_stopped(&_gb);
@@ -1601,6 +1602,11 @@ - (void) performAtomicBlock: (void (^)())block
         return;
     }
 
+    if ([NSThread currentThread] == _emulationThread) {
+        block();
+        return;
+    }
+
     _pendingAtomicBlock = block;
     while (_pendingAtomicBlock);
 }