Closedown

2017-08-23 11:37:13 +02:00
parent 3a22ba0633
commit 1efd584403
1 changed files with 4 additions and 4 deletions
@@ -897,19 +897,19 @@ def main():
    guard.controls_active = True
    # True = simulate beam down after a few seconds, False = normal operation
    guard.test = False
-    
+
+    global beam_ok
    guard.connect()
    try:
-        pass
        guard.mainloop()
+        beam_ok = True
    except KeyboardInterrupt:
        logging.info("scan guard aborted by user")
+        beam_ok = True
    except:
        print sys.exc_info()[1]

    print "guard shutting down - measurements enabled"
-␍    global beam_ok
-    beam_ok = True
    
 #This is to dispose created channels - otherwise, if channel is off, old channels remain and CPU consumption goes 100%.
 import _ca