join simulation thread when simulation stopped (#947)

jopohl · Feb 22, 2022 · b277033 · b277033
1 parent eb9d531
commit b277033
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/urh/controller/dialogs/SimulatorDialog.py b/src/urh/controller/dialogs/SimulatorDialog.py
@@ -230,7 +230,7 @@ def update_transcript_view(self):
     def closeEvent(self, event: QCloseEvent):
         self.timer.stop()
         self.simulator.stop()
-        time.sleep(0.1)
+
         self.simulator.cleanup()
 
         self.emit_editing_finished_signals()

diff --git a/src/urh/simulator/Simulator.py b/src/urh/simulator/Simulator.py
@@ -118,6 +118,7 @@ def stop(self, msg=""):
             self.log_message("Stop simulation" + (" ({})".format(msg.strip()) if msg else ""))
             self.is_simulating = False
             self.do_restart = False
+            self.simulation_thread.join(2.5)
 
         # stop devices
         if self.sniffer: