Merge branch 'cli-auto-exit' of https://github.com/kkka/onionshare into kkka-cli-auto-exit

Conflicts: onionshare/onionshare.py
2024-12-28 08:49:30 -05:00 · 2014-09-15 18:44:45 +00:00 · 2014-09-15 18:44:45 +00:00 · 2cf6bd94e9
commit 2cf6bd94e9
parent b74a6856b7 e33cfd621d
1 changed files with 7 additions and 10 deletions
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@ -254,16 +254,13 @@ def main():
    print strings._("ctrlc_to_stop")

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

 if __name__ == '__main__':
    main()