fix: properly stop EventGetterThread on exit

Author: paulmueller

CHANGELOG

@@ -2,6 +2,7 @@
  - fix: delay on selecting "Plot" tab when "Marker hue" was set to "Feature"
  - fix: set NaN-valued KDE of scatter plot points to zero
  - fix: properly close DCOR search background runner in dialog
+ - fix: properly stop `EventGetterThread` on exit
  - enh: give all separate `QThread` object a name
  - ref: migrate from loading .ui files to pyuic6-pregenerated Python files
  - setup: bump dclab to 0.71.7 (ValueError when encountering empty pipeline)

dcscope/gui/main.py

@@ -395,23 +395,20 @@ def add_plot_window(self, plot_id):
             self.subwindows_plots[plot_id] = sub
         sub.show()
 
-    def close(self):
-        if self.widget_quick_view is not None:
-            self.widget_quick_view.close()
-        return super(DCscope, self).close()
-
     @QtCore.pyqtSlot(QtCore.QEvent)
     def closeEvent(self, event):
         """Determine what happens when the user wants to quit"""
         if self.pipeline.slots or self.pipeline.filters:
-            if self.on_action_clear():
-                if self.widget_quick_view is not None:
-                    self.widget_quick_view.close()
-                event.accept()
-            else:
-                event.ignore()
+            closing = self.on_action_clear()
         else:
+            closing = True
+
+        if closing:
+            if self.widget_quick_view is not None:
+                self.widget_quick_view.close()
             event.accept()
+        else:
+            event.ignore()
 
     @QtCore.pyqtSlot(QtCore.QEvent)
     def dragEnterEvent(self, e):

dcscope/gui/quick_view/qv_event_getter.py

@@ -24,8 +24,7 @@ def __init__(self, parent):
 
     def close(self):
         self.event_abort.set()
-        while self.isRunning():
-            time.sleep(0.1)
+        self.wait()
 
     @QtCore.pyqtSlot(RTDCBase, int)
     def request_event_data(self, ds: RTDCBase, event_index: int):

dcscope/gui/quick_view/qv_main.py

@@ -250,9 +250,9 @@ def rtdc_ds(self, rtdc_ds):
         self.ui.comboBox_y.set_dataset(rtdc_ds)
         self.ui.comboBox_z_hue.set_dataset(rtdc_ds)
 
-    def close(self):
+    def closeEvent(self, a0):
         self.event_getter.close()
-        super(QuickView, self).close()
+        return super(QuickView, self).closeEvent(a0)
 
     @QtCore.pyqtSlot(dict)
     def on_pp_mod_recv(self, data):