Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Stop opening some context menus when the game's not loaded
This commit is contained in:
Henrik Rydgård 2023-12-17 16:31:41 +01:00 • committed by GitHub
commit 6140321be5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Windows/Debugger/CtrlDisAsmView.cpp
View file

@ -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:

6
Windows/GEDebugger/CtrlDisplayListView.cpp
View file

@ -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:

9
Windows/GEDebugger/SimpleGLWindow.cpp
View file

@ -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);