kiplatform: check for null window handle in IsWindowActive().

5 years ago · dc70df6036
2 changed files with 8 additions and 0 deletions
--- a/libs/kiplatform/gtk/ui.cpp
+++ b/libs/kiplatform/gtk/ui.cpp
@ -49,6 +49,9 @@ void KIPLATFORM::UI::ForceFocus( wxWindow* aWindow )

 bool KIPLATFORM::UI::IsWindowActive( wxWindow* aWindow )
 {
+    if( !aWindow )
+        return false;
+
    GtkWindow* window = GTK_WINDOW( aWindow->GetHandle() );

    if( window )
--- a/libs/kiplatform/msw/ui.cpp
+++ b/libs/kiplatform/msw/ui.cpp
@ -75,6 +75,11 @@ void KIPLATFORM::UI::ForceFocus( wxWindow* aWindow )

 bool KIPLATFORM::UI::IsWindowActive( wxWindow* aWindow )
 {
+    if(! aWindow )
+    {
+	return false;
+    }
+
    return ( aWindow->GetHWND() == GetForegroundWindow() );
 }