check if pane still exists before closing

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

src/aui/framemanager.cpp

@@ -1093,8 +1093,7 @@ bool wxAuiManager::DetachPane(wxWindow* window)
     return false;
 }
 
-// ClosePane() destroys or hides the pane depending on its
+// ClosePane() destroys or hides the pane depending on its flags
-// flags
 void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info)
 {
     // if we were maximized, restore
@@ -3531,9 +3530,17 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
         return;
     }
     else
+    {
+        // close the pane, but check that it
+        // still exists in our pane array first
+        // (the event handler above might have removed it)
+
+        wxAuiPaneInfo& check = GetPane(wnd);
+        if (check.IsOk())
         {
             ClosePane(pane);
         }
+    }
 }
 
 
@@ -4342,8 +4349,17 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
         ProcessMgrEvent(e);
 
         if (!e.GetVeto())
+        {
+            // close the pane, but check that it
+            // still exists in our pane array first
+            // (the event handler above might have removed it)
+
+            wxAuiPaneInfo& check = GetPane(pane.window);
+            if (check.IsOk())
             {
                 ClosePane(pane);
+            }
+            
             Update();
         }
     }