From bc172f488320a41b8a5bbf216a589ddac4215f06 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Jul 2014 04:49:45 -0400 Subject: [PATCH] DolphinWX: Enable certain Code View context options only when the core is running. Prior to this, attempting to execute these contextual menu options would crash the application. --- Source/Core/DolphinWX/Debugger/CodeView.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Debugger/CodeView.cpp index 582ff88042..9d7b869518 100644 --- a/Source/Core/DolphinWX/Debugger/CodeView.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeView.cpp @@ -30,6 +30,7 @@ #include "Common/DebugInterface.h" #include "Common/StringUtil.h" #include "Common/SymbolDB.h" +#include "Core/Core.h" #include "Core/Host.h" #include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/CodeView.h" @@ -370,12 +371,12 @@ void CCodeView::OnMouseUpR(wxMouseEvent& event) #endif menu->Append(IDM_RENAMESYMBOL, _("Rename &symbol"))->Enable(isSymbol); menu->AppendSeparator(); - menu->Append(IDM_RUNTOHERE, _("&Run To Here")); - menu->Append(IDM_ADDFUNCTION, _("&Add function")); - menu->Append(IDM_JITRESULTS, _("PPC vs X86")); - menu->Append(IDM_INSERTBLR, _("Insert &blr")); - menu->Append(IDM_INSERTNOP, _("Insert &nop")); - menu->Append(IDM_PATCHALERT, _("Patch alert")); + menu->Append(IDM_RUNTOHERE, _("&Run To Here"))->Enable(Core::IsRunning()); + menu->Append(IDM_ADDFUNCTION, _("&Add function"))->Enable(Core::IsRunning()); + menu->Append(IDM_JITRESULTS, _("PPC vs X86"))->Enable(Core::IsRunning()); + menu->Append(IDM_INSERTBLR, _("Insert &blr"))->Enable(Core::IsRunning()); + menu->Append(IDM_INSERTNOP, _("Insert &nop"))->Enable(Core::IsRunning()); + menu->Append(IDM_PATCHALERT, _("Patch alert"))->Enable(Core::IsRunning()); PopupMenu(menu); event.Skip(); }