diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-08-03 22:40:02 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-08-03 22:40:02 -0400 |
| commit | 1515262be910d1dd4d79bbb3e3c2eea2a3b030bd (patch) | |
| tree | 55d47feb1c8922643ce4cc521d264c2d7de041ba /Source | |
| parent | d8d99f919cd3f14f1b450e1f36f4a7e21cc64e0a (diff) | |
| parent | b6e7e0d57fa660a56e407116b5dfa3db57008581 (diff) | |
Merge pull request #710 from Armada651/d3dfullscreen_fixes
CFrame: Only re-assign focus when "Render to main" is enabled.
Diffstat (limited to 'Source')
| -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) |