diff options
author | Micah Lee <micah@micahflee.com> | 2018-01-18 12:40:55 -0800 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2018-01-18 12:40:55 -0800 |
commit | 95c8c0fb810e5fb54565f8a7902ff385f840fede (patch) | |
tree | 222121bfa4e5d37a4c265dc57db47f1870bc6fa6 | |
parent | 849998226ad5727adeb7a760b56a474f3732a2d3 (diff) | |
parent | c797dc93e179ea039706cba038235f60f6dc7508 (diff) | |
download | onionshare-1.2.tar.gz onionshare-1.2.zip |
Merge branch 'mig5-fix_slug_cli_mode'v1.2
-rw-r--r-- | onionshare/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/onionshare/__init__.py b/onionshare/__init__.py index e7e34ed9..76d2b601 100644 --- a/onionshare/__init__.py +++ b/onionshare/__init__.py @@ -115,6 +115,7 @@ def main(cwd=None): print('') # Start OnionShare http service in new thread + settings.load() t = threading.Thread(target=web.start, args=(app.port, app.stay_open, settings.get('slug'))) t.daemon = True t.start() @@ -128,7 +129,6 @@ def main(cwd=None): app.shutdown_timer.start() # Save the web slug if we are using a persistent private key - settings.load() if settings.get('save_private_key'): if not settings.get('slug'): settings.set('slug', web.slug) |