wxWindow::FindFocus() sometimes return NULL, check for that to avoid segfaulting

2012-04-15 02:24:41 +02:00 · 2012-04-15 02:24:41 +02:00 · c08510baa8
parent e09dd77914
commit c08510baa8
1 changed files with 7 additions and 1 deletions
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@ -371,5 +371,11 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event)

 bool TASInputDlg::HasFocus()
 {
-	return (wxWindow::FindFocus() == this || wxWindow::FindFocus()->GetParent() == this);
+    if (wxWindow::FindFocus() == this)
+        return true;
+    else if (wxWindow::FindFocus() != NULL &&
+             wxWindow::FindFocus()->GetParent() == this)
+        return true;
+    else
+        return false;
 }