Use finally to reset mainloop ownership

richardsheridan · richardsheridan · commit 118876e867f4 · 2020-07-02T08:12:35.000-04:00
skip running mainloop if we already own one

do cheaper test first
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -460,7 +460,7 @@ def destroy(self, *args):
 
         self.window.destroy()
 
-        if not Gcf.get_num_fig_managers() and self._owns_mainloop:
+        if self._owns_mainloop and not Gcf.get_num_fig_managers():
             self.window.quit()
 
     def get_window_title(self):
@@ -884,6 +884,10 @@ def mainloop():
         if managers:
             first_manager = managers[0]
             manager_class = type(first_manager)
+            if manager_class._owns_mainloop:
+                return
             manager_class._owns_mainloop = True
-            first_manager.window.mainloop()
-            manager_class._owns_mainloop = False
+            try:
+                first_manager.window.mainloop()
+            finally:
+                manager_class._owns_mainloop = False
