mirror of
https://github.com/onionshare/onionshare.git
synced 2025-01-10 03:37:28 -03:00
Merge branch 'connect_to_tor_emitted_on_persistent_tabs' of https://github.com/mig5/onionshare into mig5-connect_to_tor_emitted_on_persistent_tabs
This commit is contained in:
commit
b4e022149d
2 changed files with 2 additions and 0 deletions
|
@ -163,6 +163,7 @@ class MainWindow(QtWidgets.QMainWindow):
|
|||
# Start the "Connecting to Tor" dialog, which calls onion.connect()
|
||||
tor_con = TorConnectionDialog(self.common)
|
||||
tor_con.canceled.connect(self.tor_connection_canceled)
|
||||
tor_con.success.connect(self.tabs.tor_is_connected)
|
||||
tor_con.open_tor_settings.connect(self.tor_connection_open_tor_settings)
|
||||
if not self.common.gui.local_only:
|
||||
tor_con.start()
|
||||
|
|
|
@ -119,6 +119,7 @@ class TorConnectionDialog(QtWidgets.QProgressDialog):
|
|||
self.active = False
|
||||
# Close the dialog after connecting
|
||||
self.setValue(self.maximum())
|
||||
self.success.emit()
|
||||
|
||||
def _canceled_connecting_to_tor(self):
|
||||
self.common.log("TorConnectionDialog", "_canceled_connecting_to_tor")
|
||||
|
|
Loading…
Reference in a new issue