Test if a frame is not already being deleted before trying to Destroy.

fixes matplotlib#3316
RobinD42 · Dec 8, 2015 · 187c5bc · 187c5bc
1 parent 3ae7c2a
commit 187c5bc
Showing 1 changed file with 7 additions and 6 deletions.
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