Merge branch '707_fix_receive_mode_on_tor_disconnect' of https://github.com/mig5/onionshare into mig5-707_fix_receive_mode_on_tor_disconnect

This commit is contained in:
Micah Lee 2018-09-02 22:56:39 -07:00
commit e1976fdca0
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
2 changed files with 10 additions and 0 deletions

View file

@ -307,6 +307,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
if not self.timer.isActive():
self.timer.start(500)
self.share_mode.on_reload_settings()
self.receive_mode.on_reload_settings()
self.status_bar.clearMessage()
# If we switched off the shutdown timeout setting, ensure the widget is hidden.
@ -350,6 +351,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.system_tray.showMessage(strings._('gui_tor_connection_lost', True), strings._('gui_tor_connection_error_settings', True))
self.share_mode.handle_tor_broke()
self.receive_mode.handle_tor_broke()
# Process events from the web object
if self.mode == self.MODE_SHARE: