Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-23 08:31:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1031 from mig5/950_persistence_fix

Browse source 
Persistence fix (#950)
This commit is contained in:
Micah Lee 2019-09-20 17:35:38 -07:00 • committed by GitHub
commit 94e2f4997c
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
onionshare/onion.py
View file

@ -438,6 +438,10 @@ class Onion(object):
return the onion hostname. return the onion hostname.
""" """
self.common.log('Onion', 'start_onion_service') self.common.log('Onion', 'start_onion_service')
# Settings may have changed in the frontend but not updated in our settings object,
# such as persistence. Reload the settings now just to be sure.
self.settings.load()
self.auth_string = None self.auth_string = None
if not self.supports_ephemeral: if not self.supports_ephemeral:

3
onionshare_gui/server_status.py
View file

@ -240,6 +240,9 @@ class ServerStatus(QtWidgets.QWidget):
""" """
# Set the URL fields # Set the URL fields
if self.status == self.STATUS_STARTED: if self.status == self.STATUS_STARTED:
# The backend Onion may have saved new settings, such as the private key.
# Reload the settings before saving new ones.
self.common.settings.load()
self.show_url() self.show_url()
if self.common.settings.get('save_private_key'): if self.common.settings.get('save_private_key'):