fixed crash in wxHtmlHelpController if the help window is still open

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-13 23:42:57 +00:00
parent 4cbfec1580
commit 664d172947
4 changed files with 15 additions and 3 deletions
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -87,12 +87,13 @@ void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
 {
    if (m_Config)
        WriteCustomization(m_Config, m_ConfigRoot);
-    
+
    evt.Skip();

    OnQuit();

-    m_helpWindow->SetController(NULL);
+    if ( m_helpWindow )
+        m_helpWindow->SetController(NULL);
    m_helpWindow = NULL;
    m_helpDialog = NULL;
    m_helpFrame = NULL;