Merge branch 'kkka-cli-auto-exit'

2025-02-17 13:02:42 -05:00 · 2014-09-15 18:44:54 +00:00 · 2014-09-15 18:44:54 +00:00 · 5a5f1f0480
commit 5a5f1f0480
parent b74a6856b7 2cf6bd94e9
1 changed files with 7 additions and 10 deletions
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@ -254,14 +254,11 @@ def main():
    print strings._("ctrlc_to_stop")

    # wait for app to close
-    running = True
-    while running:
    try:
-            time.sleep(0.5)
+        t.join()
    except KeyboardInterrupt:
-            running = False
        web.stop(app.port)
-
+    finally:
        # shutdown
        app.cleanup()