summaryrefslogtreecommitdiff
path: root/onionshare
diff options
context:
space:
mode:
authorMiguel Jacq <mig@mig5.net>2018-01-18 08:14:36 +1100
committerMiguel Jacq <mig@mig5.net>2018-01-18 08:14:36 +1100
commit9ed748db868c040d75928b045a973a7df9d458b5 (patch)
tree8dfc5227a52e7ab51859bcc40c058d4523178675 /onionshare
parent4261670b594617a6984f8ee2c5b3a6f98be58f55 (diff)
downloadonionshare-9ed748db868c040d75928b045a973a7df9d458b5.tar.gz
onionshare-9ed748db868c040d75928b045a973a7df9d458b5.zip
load the Settings in onionshare/__init__.py later, so that when saving slug, the private_key/hidservauth string have already been saved by the Onion object
Diffstat (limited to 'onionshare')
-rw-r--r--onionshare/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/onionshare/__init__.py b/onionshare/__init__.py
index 78f754fc..e7e34ed9 100644
--- a/onionshare/__init__.py
+++ b/onionshare/__init__.py
@@ -79,7 +79,6 @@ def main(cwd=None):
settings = Settings(config)
- settings.load()
# Start the Onion object
onion = Onion()
@@ -129,6 +128,7 @@ 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)