Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-06-07 06:13:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Ensure we always set the service id, so we can stop the right one (particularly when scheduling a share)

Browse source
This commit is contained in:
Miguel Jacq 2019-11-29 18:40:45 +11:00
parent 981220d1ce
commit 29e60fcacf
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
onionshare/onion.py
View file

@ -666,8 +666,7 @@ class Onion(object):
onion_host = res.service_id + ".onion" onion_host = res.service_id + ".onion"
# Save the service_id # Save the service_id
if not mode_settings.get("general", "service_id"): mode_settings.set("general", "service_id", res.service_id)
mode_settings.set("general", "service_id", res.service_id)
# Save the private key and hidservauth string if persistence is enabled # Save the private key and hidservauth string if persistence is enabled
if mode_settings.get("persistent", "enabled"): if mode_settings.get("persistent", "enabled"):
@ -712,7 +711,6 @@ class Onion(object):
""" """
onion_host = mode_settings.get("general", "service_id") onion_host = mode_settings.get("general", "service_id")
self.common.log("Onion", "stop_onion_service", f"onion host: {onion_host}") self.common.log("Onion", "stop_onion_service", f"onion host: {onion_host}")
try: try:
self.c.remove_ephemeral_hidden_service( self.c.remove_ephemeral_hidden_service(
mode_settings.get("general", "service_id") mode_settings.get("general", "service_id")

2
onionshare_gui/threads.py
View file

@ -76,7 +76,7 @@ class OnionThread(QtCore.QThread):
time.sleep(0.2) time.sleep(0.2)
self.success_early.emit() self.success_early.emit()
# Unregister the onion so we can use it in the next OnionThread # Unregister the onion so we can use it in the next OnionThread
self.mode.app.onion.cleanup(False) self.mode.app.stop_onion_service(self.mode.settings)
else: else:
self.mode.app.start_onion_service( self.mode.app.start_onion_service(
self.mode.settings, await_publication=True self.mode.settings, await_publication=True