Merge pull request #710 from Armada651/d3dfullscreen_fixes

CFrame: Only re-assign focus when "Render to main" is enabled.
This commit is contained in:
Lioncash 2014-08-03 22:40:02 -04:00
commit 1515262be9

View File

@ -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)