Debugger: Lua - Keep the first non-zero value when emu.stop + prevent…

… crash when called multiple times
SourMesen · Apr 7, 2024 · 852f92f · 852f92f
1 parent a015fa8
commit 852f92f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Core/Shared/Emulator.cpp b/Core/Shared/Emulator.cpp
@@ -1063,8 +1063,14 @@ bool Emulator::IsEmulationThread()
 
 void Emulator::SetStopCode(int32_t stopCode)
 {
+	if(_stopCode != 0) {
+		//If a non-0 code was already set, keep the previous value
+		return;
+	}
+
 	_stopCode = stopCode;
-	if(!_stopFlag) {
+	if(!_stopFlag && !_stopRequested) {
+		_stopRequested = true;
 		thread stopEmuTask([this]() {
 			Stop(true);
 		});

diff --git a/Core/Shared/Emulator.h b/Core/Shared/Emulator.h
@@ -116,6 +116,7 @@ class Emulator
 
 	uint32_t _autoSaveStateFrameCounter = 0;
 	int32_t _stopCode = 0;
+	bool _stopRequested = false;
 
 	void WaitForLock();
 	void WaitForPauseEnd();