cancel timeout if manually stopped

Author: richardsheridan

lib/matplotlib/backends/_backend_tk.py

@@ -166,6 +166,7 @@ def __init__(self, figure=None, master=None, resize_callback=None):
         super().__init__(figure)
         self._idle = True
         self._idle_callback = None
+        self._event_loop_id = None
         w, h = self.figure.bbox.size.astype(int)
         self._tkcanvas = tk.Canvas(
             master=master, background="white",
@@ -360,13 +361,16 @@ def start_event_loop(self, timeout=0):
         # docstring inherited
         milliseconds = int(1000 * timeout)
         if milliseconds > 0:
-            self._master.after(milliseconds, self.stop_event_loop)
-        elif milliseconds == 0:
-            self._master.after_idle(self.stop_event_loop)
+            self._event_loop_id = self._tkcanvas.after(milliseconds, self.stop_event_loop)
+        else:
+            self._event_loop_id = self._tkcanvas.after_idle(self.stop_event_loop)
         self._master.mainloop()
 
     def stop_event_loop(self):
         # docstring inherited
+        if self._event_loop_id:
+            self._master.after_cancel(self._event_loop_id)
+            self._event_loop_id = None
         self._master.quit()
 
 
@@ -442,6 +446,8 @@ def destroy(*args):
     def destroy(self, *args):
         if self.canvas._idle_callback:
             self.canvas._tkcanvas.after_cancel(self.canvas._idle_callback)
+        if self.canvas._event_loop_id:
+            self.canvas._tkcanvas.after_cancel(self.canvas._event_loop_id)
 
         # NOTE: events need to be flushed before issuing destroy (GH #9956),
         # however, self.window.update() can break user code. This is the