Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-20 11:41:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_slug_cli_mode' of https://github.com/mig5/onionshare into mig5-fix_slug_cli_mode

Browse Source
This commit is contained in:
Micah Lee 2018-01-18 12:15:57 -08:00
commit c797dc93e1
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onionshare/__init__.py
View File

@ -115,6 +115,7 @@ def main(cwd=None):
print('') print('')
# Start OnionShare http service in new thread # 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 = threading.Thread(target=web.start, args=(app.port, app.stay_open, settings.get('slug')))
t.daemon = True t.daemon = True
t.start() t.start()
@ -128,7 +129,6 @@ def main(cwd=None):
app.shutdown_timer.start() app.shutdown_timer.start()
# Save the web slug if we are using a persistent private key # Save the web slug if we are using a persistent private key
settings.load()
if settings.get('save_private_key'): if settings.get('save_private_key'):
if not settings.get('slug'): if not settings.get('slug'):
settings.set('slug', web.slug) settings.set('slug', web.slug)