diff options
| -rw-r--r-- | cli/onionshare_cli/web/web.py | 4 | ||||
| -rw-r--r-- | desktop/onionshare/tor_settings_tab.py | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/cli/onionshare_cli/web/web.py b/cli/onionshare_cli/web/web.py index a6ccbeb0..3a15fdc1 100644 --- a/cli/onionshare_cli/web/web.py +++ b/cli/onionshare_cli/web/web.py @@ -365,7 +365,8 @@ class Web: ) self.waitress.run() except Exception as e: - raise WaitressException(f"Error starting Waitress: {e}") + if not self.waitress.shutdown: + raise WaitressException(f"Error starting Waitress: {e}") def stop(self, port): """ @@ -398,6 +399,7 @@ class Web: def waitress_custom_shutdown(self): """Shutdown the Waitress server immediately""" # Code borrowed from https://github.com/Pylons/webtest/blob/4b8a3ebf984185ff4fefb31b4d0cf82682e1fcf7/webtest/http.py#L93-L104 + self.waitress.shutdown = True while self.waitress._map: triggers = list(self.waitress._map.values()) for trigger in triggers: diff --git a/desktop/onionshare/tor_settings_tab.py b/desktop/onionshare/tor_settings_tab.py index 0a2b12e2..a7aa4bbb 100644 --- a/desktop/onionshare/tor_settings_tab.py +++ b/desktop/onionshare/tor_settings_tab.py @@ -97,7 +97,7 @@ class TorSettingsTab(QtWidgets.QWidget): self.bridge_use_checkbox = QtWidgets.QCheckBox( strings._("gui_settings_bridge_use_checkbox") ) - self.bridge_use_checkbox.stateChanged.connect( + self.bridge_use_checkbox.clicked.connect( self.bridge_use_checkbox_state_changed ) @@ -529,15 +529,17 @@ class TorSettingsTab(QtWidgets.QWidget): self.connection_type_socks.hide() self.connection_type_bridges_radio_group.show() - def bridge_use_checkbox_state_changed(self, state): + def bridge_use_checkbox_state_changed(self): """ 'Use a bridge' checkbox changed """ - if state == QtCore.Qt.Checked: + if self.bridge_use_checkbox.isChecked(): + self.common.log("TorSettingsTab", "bridge_use_checkbox_state_changed", "Use bridge checkbox toggled on") self.bridge_settings.show() self.bridge_builtin_radio.click() self.bridge_builtin_dropdown.setCurrentText("obfs4") else: + self.common.log("TorSettingsTab", "bridge_use_checkbox_state_changed", "Use bridge checkbox toggled off") self.bridge_settings.hide() def bridge_builtin_radio_toggled(self, checked): |