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

Conflicts:
	onionshare/onionshare.py
This commit is contained in:
Micah Lee 2014-09-15 18:44:45 +00:00
commit 2cf6bd94e9

View File

@ -254,14 +254,11 @@ def main():
print strings._("ctrlc_to_stop") print strings._("ctrlc_to_stop")
# wait for app to close # wait for app to close
running = True
while running:
try: try:
time.sleep(0.5) t.join()
except KeyboardInterrupt: except KeyboardInterrupt:
running = False
web.stop(app.port) web.stop(app.port)
finally:
# shutdown # shutdown
app.cleanup() app.cleanup()