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

Fix conflicts

Browse source
This commit is contained in:
Miguel Jacq 2018-09-16 13:37:22 +10:00
commit 3a7ae401af
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
51 changed files with 759 additions and 887 deletions
Download patch file Download diff file Expand all files Collapse all files

2
onionshare_gui/server_status.py
View file

@ -335,7 +335,7 @@ class ServerStatus(QtWidgets.QWidget):
"""
Returns the OnionShare URL.
"""
if self.mode == ServerStatus.MODE_RECEIVE and self.common.settings.get('receive_public_mode'):
if self.common.settings.get('public_mode'):
url = 'http://{0:s}'.format(self.app.onion_host)
else:
url = 'http://{0:s}/{1:s}'.format(self.app.onion_host, self.web.slug)