ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from Tilka/tab_crash 

Fix crash when pressing Tab
This commit is contained in:
Pierre Bourdon 2014-04-14 10:46:07 +02:00
parent 4f3227b4a9 296637d6f2
commit c614a707ab
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/DolphinWX/Frame.cpp
View File

@ -706,13 +706,16 @@ bool CFrame::RendererHasFocus()
if (m_RenderParent->GetParent()->GetHWND() == GetForegroundWindow()) if (m_RenderParent->GetParent()->GetHWND() == GetForegroundWindow())
return true; return true;
#else #else
if (wxWindow::FindFocus() == nullptr) wxWindow *window = wxWindow::FindFocus();
if (window == nullptr)
return false; return false;
// Why these different cases? // Why these different cases?
if (m_RenderParent == wxWindow::FindFocus() || if (m_RenderParent == window ||
m_RenderParent == wxWindow::FindFocus()->GetParent() || m_RenderParent == window->GetParent() ||
m_RenderParent->GetParent() == wxWindow::FindFocus()->GetParent()) m_RenderParent->GetParent() == window->GetParent())
{
return true; return true;
}
#endif #endif
return false; return false;
} }