Close all plot windows of a blocking show() on Ctrl+C

timhoffm · timhoffm · commit 73c0bd69cb24 · 2023-10-18T13:02:44.000+02:00
Addresses the Qt part of #23385. It appears that `qapp.quit()` does not automatically close the windows of the app. We therefore do it explicitly. A unit test for this would be quite complex. Test this by hand by Ctrl+C in an interactive shell.
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -163,7 +163,7 @@ def _exec(obj):
 
 
 @contextlib.contextmanager
-def _maybe_allow_interrupt(qapp):
+def _maybe_allow_interrupt(qapp_or_eventloop):
     """
     This manager allows to terminate a plot by sending a SIGINT. It is
     necessary because the running Qt backend prevents Python interpreter to
@@ -215,7 +215,9 @@ def _may_clear_sock(*args):
     def handle(*args):
         nonlocal handler_args
         handler_args = args
-        qapp.quit()
+        if hasattr(qapp_or_eventloop, 'closeAllWindows'):
+            qapp_or_eventloop.closeAllWindows()
+        qapp_or_eventloop.quit()
 
     signal.signal(signal.SIGINT, handle)
     try:
