Fix incorrect close function in HTML_MESSAGE_BOX (whichcan be shown in modal or not modal mode)

35c23f31 · unknown · jean-pierre charras · 834b31b4 · 35c23f31
Commit 35c23f31 authored Mar 20, 2015 by unknown Committed by jean-pierre charras Mar 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

html_messagebox.cpp common/html_messagebox.cpp +6 -1

No files found.
--- a/common/html_messagebox.cpp
+++ b/common/html_messagebox.cpp
@@ -39,7 +39,12 @@ HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* parent, const wxString& aTitle,

 void HTML_MESSAGE_BOX::OnCloseButtonClick( wxCommandEvent& event )
 {
-    EndModal( 0 );
+    // the dialog can be shown modal or not modal.
+    // therefore, use the right way to close it.
+    if( IsModal() )
+        EndModal( 0 );
+    else
+        Destroy();
 }