diff options
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) |