diff options
| author | Jules Blok <jules.blok@gmail.com> | 2014-08-01 21:31:17 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2014-08-03 13:37:19 +0200 |
| commit | b6e7e0d57fa660a56e407116b5dfa3db57008581 (patch) | |
| tree | 0e1e177d2dda138d50fb677e29f02e8bfd24f36c /Source/Core/DolphinWX/Frame.cpp | |
| parent | 0380bb61fab086a6d40fbd0110899971b694411e (diff) | |
CFrame: Only re-assign focus when "Render to main" is enabled.
It may cause fullscreen loops and since m_RenderFrame == m_RenderParent now it's not necessary to re-assign focus anymore.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 057d20172a..bd1c1c565d 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -479,11 +479,14 @@ void CFrame::OnActive(wxActivateEvent& event) { if (event.GetActive() && event.GetEventObject() == m_RenderFrame) { + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) + { #ifdef __WXMSW__ - ::SetFocus((HWND)m_RenderParent->GetHandle()); + ::SetFocus((HWND)m_RenderParent->GetHandle()); #else - m_RenderParent->SetFocus(); + m_RenderParent->SetFocus(); #endif + } if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && Core::GetState() == Core::CORE_RUN) |