Merge pull request #25161 from meeseeksmachine/auto-backport-of-pr-25158-on-v3.7.x

ksunden · web-flow · commit 0bafdf23235e · 2023-02-06T21:17:39.000-06:00
Backport PR #25158 on branch v3.7.x (Disconnect SubplotTool destroyer callback on tool_fig close)
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -3357,10 +3357,14 @@ def configure_subplots(self, *args):
         tool_fig = manager.canvas.figure
         tool_fig.subplots_adjust(top=0.9)
         self.subplot_tool = widgets.SubplotTool(self.canvas.figure, tool_fig)
-        tool_fig.canvas.mpl_connect(
-            "close_event", lambda e: delattr(self, "subplot_tool"))
-        self.canvas.mpl_connect(
+        cid = self.canvas.mpl_connect(
             "close_event", lambda e: manager.destroy())
+
+        def on_tool_fig_close(e):
+            self.canvas.mpl_disconnect(cid)
+            del self.subplot_tool
+
+        tool_fig.canvas.mpl_connect("close_event", on_tool_fig_close)
         manager.show()
         return self.subplot_tool
 
