Fix stopping queued experiment
This commit is contained in:
parent
3a81893a25
commit
7dc963143d
@ -462,7 +462,7 @@ class DamarisGUI:
|
|||||||
self.stop_experiment_flag.clear()
|
self.stop_experiment_flag.clear()
|
||||||
|
|
||||||
self.id = self.lockfile.add_experiment()
|
self.id = self.lockfile.add_experiment()
|
||||||
while not self.lockfile.am_i_next() and not self.stop_experiment_flag.isSet():
|
while not self.lockfile.am_i_next():
|
||||||
self.stop_experiment_flag.wait(interval)
|
self.stop_experiment_flag.wait(interval)
|
||||||
while gtk.events_pending():
|
while gtk.events_pending():
|
||||||
gtk.main_iteration(False)
|
gtk.main_iteration(False)
|
||||||
@ -471,6 +471,10 @@ class DamarisGUI:
|
|||||||
loop_run = 0
|
loop_run = 0
|
||||||
loop_run += interval
|
loop_run += interval
|
||||||
|
|
||||||
|
if self.stop_experiment_flag.isSet():
|
||||||
|
self.experiment_script_statusbar_label.set_text("Experiment stopped")
|
||||||
|
return
|
||||||
|
|
||||||
# start experiment
|
# start experiment
|
||||||
try:
|
try:
|
||||||
self.spool_dir = os.path.abspath( actual_config[ "spool_dir" ] )
|
self.spool_dir = os.path.abspath( actual_config[ "spool_dir" ] )
|
||||||
|
Loading…
Reference in New Issue
Block a user