Check for potentially NULL m_focus (Patch #1187992)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 5e6586bb3ccf48ec1c3504ce1afafc9fcd97acc7..150f81a92cba619d089a8bec466e1d75e8aaa8ab 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -289,9 +289,10 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
     m_child->Connect(wxEVT_DESTROY,
                      wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
                      NULL, this);
-    m_focus->Connect(wxEVT_DESTROY,
-                     wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
-                     NULL, this);
+    if (m_focus)
+        m_focus->Connect(wxEVT_DESTROY,
+                         wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
+                         NULL, this);
 }
 
 bool wxPopupTransientWindow::Show( bool show )