summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorDolphin Bot <dolphin-emu-bot@users.noreply.github.com>2014-11-17 20:44:48 +0100
committerDolphin Bot <dolphin-emu-bot@users.noreply.github.com>2014-11-17 20:44:48 +0100
commitdced84d4404b1f0346297c5941bfdf94cfdef4d5 (patch)
treed84b7a6d2629493ca8a43b70253ae448cd84f2ce /Source/Core/DolphinWX/FrameTools.cpp
parent05890fa752cd434643c45de75a5430ba8daf7b25 (diff)
parentea11c446c2a93de8fc8c77f97d344e7584dccba7 (diff)
Merge pull request #1564 from RachelBryk/freelook
Make freelook hotkeys configurable.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index dc129c693e..22dbdc0e6d 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -1771,7 +1771,8 @@ void CFrame::UpdateGUI()
{
if (GetCmdForHotkey(i) == -1)
continue;
- GetMenuBar()->FindItem(GetCmdForHotkey(i))->SetItemLabel(GetMenuLabel(i));
+ if (GetMenuBar()->FindItem(GetCmdForHotkey(i)))
+ GetMenuBar()->FindItem(GetCmdForHotkey(i))->SetItemLabel(GetMenuLabel(i));
}
GetMenuBar()->FindItem(IDM_LOADSTATE)->Enable(Initialized);