aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2022-01-16 14:23:52 -0800
committerMicah Lee <micah@micahflee.com>2022-01-16 14:23:52 -0800
commitb4e022149d677f9c2acd639e9dfa77bcc712b068 (patch)
treec4b0c23f98985214444aa0113ac16bb980a9156d
parent81fc7d67f592ea7047bd495a76b08341a2e0a06f (diff)
parenta335e9738cac0157db681fc2c6cdaf1ffbaea628 (diff)
downloadonionshare-b4e022149d677f9c2acd639e9dfa77bcc712b068.tar.gz
onionshare-b4e022149d677f9c2acd639e9dfa77bcc712b068.zip
Merge branch 'connect_to_tor_emitted_on_persistent_tabs' of https://github.com/mig5/onionshare into mig5-connect_to_tor_emitted_on_persistent_tabs
-rw-r--r--desktop/onionshare/main_window.py1
-rw-r--r--desktop/onionshare/tor_connection.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/desktop/onionshare/main_window.py b/desktop/onionshare/main_window.py
index 546592a1..6e5cd61d 100644
--- a/desktop/onionshare/main_window.py
+++ b/desktop/onionshare/main_window.py
@@ -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()
diff --git a/desktop/onionshare/tor_connection.py b/desktop/onionshare/tor_connection.py
index 2cc599c4..d17ea7cb 100644
--- a/desktop/onionshare/tor_connection.py
+++ b/desktop/onionshare/tor_connection.py
@@ -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")