summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2014-06-15 13:13:37 +0200
committerJules Blok <jules.blok@gmail.com>2014-07-19 21:14:38 +0200
commit8d76dca30dd1969bc01a0df8b7b23319d95920d3 (patch)
treea40581df304c9cf3e60b578993549f2a1ad5a475 /Source
parent66fec6d0bd8c90a96bbd28773199fba392ea9b2e (diff)
Frame: Make RendererHasFocus() compatible with the new window structure.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 94698837dc..763909e26b 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -722,7 +722,11 @@ bool CFrame::RendererHasFocus()
if (m_RenderParent == nullptr)
return false;
#ifdef _WIN32
- if (m_RenderParent->GetParent()->GetHWND() == GetForegroundWindow())
+ HWND window = GetForegroundWindow();
+ if (window == nullptr)
+ return false;
+
+ if (m_RenderFrame->GetHWND() == window)
return true;
#else
wxWindow *window = wxWindow::FindFocus();