Merge pull request #710 from Armada651/d3dfullscreen_fixes

CFrame: Only re-assign focus when "Render to main" is enabled.
dolphin-emu · Aug 4, 2014 · 1515262 · 1515262
2 parents d8d99f9 + b6e7e0d
commit 1515262
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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)