Merge pull request #18566 from Nemoumbra/debugger-ui-fix

Stop opening some context menus when the game's not loaded
hrydgard · Dec 17, 2023 · 6140321 · 6140321
2 parents e5af1f8 + a4fe83e
commit 6140321
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/Windows/Debugger/CtrlDisAsmView.cpp b/Windows/Debugger/CtrlDisAsmView.cpp
@@ -954,6 +954,12 @@ void CtrlDisAsmView::onMouseUp(WPARAM wParam, LPARAM lParam, int button)
 	}
 	else if (button == 2)
 	{
+		// We don't want to let the users play with deallocated or uninitialized debugging objects
+		GlobalUIState state = GetUIState();
+		if (state != UISTATE_INGAME && state != UISTATE_PAUSEMENU) {
+			return;
+		}
+
 		switch (TriggerContextMenu(ContextMenuID::DISASM, wnd, ContextPoint::FromEvent(lParam)))
 		{
 		case ID_DISASM_GOTOINMEMORYVIEW:

diff --git a/Windows/GEDebugger/CtrlDisplayListView.cpp b/Windows/GEDebugger/CtrlDisplayListView.cpp
@@ -311,6 +311,12 @@ void CtrlDisplayListView::onMouseUp(WPARAM wParam, LPARAM lParam, int button)
 		HMENU menu = GetContextMenu(ContextMenuID::DISPLAYLISTVIEW);
 		EnableMenuItem(menu, ID_GEDBG_SETCOND, GPUBreakpoints::IsAddressBreakpoint(curAddress) ? MF_ENABLED : MF_GRAYED);
 
+		// We don't want to let the users play with deallocated or uninitialized debugging objects
+		GlobalUIState state = GetUIState();
+		if (state != UISTATE_INGAME && state != UISTATE_PAUSEMENU) {
+			return;
+		}
+
 		switch (TriggerContextMenu(ContextMenuID::DISPLAYLISTVIEW, wnd, ContextPoint::FromEvent(lParam)))
 		{
 		case ID_DISASM_GOTOINMEMORYVIEW:

diff --git a/Windows/GEDebugger/SimpleGLWindow.cpp b/Windows/GEDebugger/SimpleGLWindow.cpp
@@ -27,6 +27,8 @@
 #include "Windows/GEDebugger/SimpleGLWindow.h"
 #include "Windows/W32Util/ContextMenu.h"
 
+#include "Core/System.h"
+
 const wchar_t *SimpleGLWindow::windowClass = L"SimpleGLWindow";
 
 using namespace Lin;
@@ -591,6 +593,13 @@ bool SimpleGLWindow::RightClick(int mouseX, int mouseY) {
 	POINT pos = PosFromMouse(mouseX, mouseY);
 
 	rightClickCallback_(0, pos.x, pos.y);
+
+	// We don't want to let the users play with deallocated or uninitialized debugging objects
+	GlobalUIState state = GetUIState();
+	if (state != UISTATE_INGAME && state != UISTATE_PAUSEMENU) {
+		return true;
+	}
+
 	int result = TriggerContextMenu(rightClickMenu_, hWnd_, ContextPoint::FromClient(pt));
 	if (result > 0) {
 		rightClickCallback_(result, pos.x, pos.y);