Merge branch 'master' into TemporaryHackishBranch

This commit is contained in:
LunaMoo committed 2021-11-14 01:13:45 +01:00
commit 48630f0b87
15 files changed
+185 -89

No files matched your search

+3
View File
@@ -912,18 +912,21 @@ namespace MainWindow {
break;
case ID_DEBUG_DISASSEMBLY:
CreateDisasmWindow();
if (disasmWindow)
disasmWindow->Show(true);
break;
case ID_DEBUG_GEDEBUGGER:
#if PPSSPP_API(ANY_GL)
CreateGeDebuggerWindow();
if (geDebuggerWindow)
geDebuggerWindow->Show(true);
#endif
break;
case ID_DEBUG_MEMORYVIEW:
CreateMemoryWindow();
if (memoryWindow)
memoryWindow->Show(true);
break;