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

#447 show alert and exit if the Settings dialog is canceled yet Tor is still not connected

Browse Source
This commit is contained in:
Miguel Jacq 2017-12-04 18:43:40 +11:00
parent 9910ea5c72
commit fe311f591f
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
onionshare_gui/settings_dialog.py
View File

@ -505,7 +505,11 @@ class SettingsDialog(QtWidgets.QDialog):
Cancel button clicked. Cancel button clicked.
""" """
common.log('SettingsDialog', 'cancel_clicked') common.log('SettingsDialog', 'cancel_clicked')
self.close() if not self.onion.connected_to_tor:
Alert(strings._('gui_tor_connection_canceled', True), QtWidgets.QMessageBox.Warning)
sys.exit()
else:
self.close()
def help_clicked(self): def help_clicked(self):
""" """

1
share/locale/en.json
View File

@ -112,5 +112,6 @@
"gui_tor_connection_ask_open_settings": "Open Settings", "gui_tor_connection_ask_open_settings": "Open Settings",
"gui_tor_connection_ask_quit": "Quit", "gui_tor_connection_ask_quit": "Quit",
"gui_tor_connection_error_settings": "Try adjusting how OnionShare connects to the Tor network in Settings.", "gui_tor_connection_error_settings": "Try adjusting how OnionShare connects to the Tor network in Settings.",
"gui_tor_connection_canceled": "OnionShare is disconnected from Tor.\n\nPlease re-open OnionShare and configure the Tor connection.",
"share_via_onionshare": "Share via OnionShare" "share_via_onionshare": "Share via OnionShare"
} }