Merge pull request #5639 from RobinD42/issue3316-fix-wx-crash

mdboom · mdboom · commit 921a7ba1dc70 · 2015-12-09T08:58:27.000-05:00
Test if a frame is not already being deleted before trying to Destroy.
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1329,12 +1329,13 @@ def Destroy(self, *args, **kwargs):
             # Rationale for line above: see issue 2941338.
         except AttributeError:
             pass  # classic toolbar lacks the attribute
-        wx.Frame.Destroy(self, *args, **kwargs)
-        if self.toolbar is not None:
-            self.toolbar.Destroy()
-        wxapp = wx.GetApp()
-        if wxapp:
-            wxapp.Yield()
+        if not self.IsBeingDeleted():
+            wx.Frame.Destroy(self, *args, **kwargs)
+            if self.toolbar is not None:
+                self.toolbar.Destroy()
+            wxapp = wx.GetApp()
+            if wxapp:
+                wxapp.Yield()
         return True
 
 
