summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index e65747cc07..dc6aa79ac1 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -947,6 +947,9 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
static bool IsHotkey(wxKeyEvent &event, int Id, bool keyUp = false)
{
+ if (Core::GetState() == Core::CORE_UNINITIALIZED)
+ return false;
+
// Input event hotkey
if (event.GetKeyCode() == WXK_NONE)
{