diff options
| author | Micah Lee <micah@micahflee.com> | 2016-09-05 11:36:41 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2016-09-05 11:36:41 -0700 |
| commit | b7d1a7339c9a945140c8fa0aeb6ef2f302b84345 (patch) | |
| tree | 9d24c6fec3eb23f109cdb4fc2557d8b2ad72cc6b | |
| parent | 87761c6fce7433df0560d82231279e2906dae2f4 (diff) | |
| download | onionshare-b7d1a7339c9a945140c8fa0aeb6ef2f302b84345.tar.gz onionshare-b7d1a7339c9a945140c8fa0aeb6ef2f302b84345.zip | |
Refactor onionshare GUI to use await_publication=True when using ephemeral onion services
| -rw-r--r-- | onionshare_gui/onionshare_gui.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index abb86397..5e1ea47c 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -150,14 +150,14 @@ class OnionShareGui(QtWidgets.QMainWindow): self.status_bar.showMessage(strings._('gui_starting_server1', True)) self.app.choose_port() try: - self.app.start_onion_service(gui=True) + self.app.start_onion_service() except onionshare.onion.NoTor as e: alert(e.args[0], QtWidgets.QMessageBox.Warning) self.server_status.stop_server() self.status_bar.clearMessage() return - # start onionshare service in new thread + # start onionshare http service in new thread t = threading.Thread(target=web.start, args=(self.app.port, self.app.stay_open, self.app.transparent_torification)) t.daemon = True t.start() @@ -170,7 +170,7 @@ class OnionShareGui(QtWidgets.QMainWindow): self.starting_server_step2.emit() # wait for hs - if not self.app.local_only: + if not self.app.local_only and not self.app.onion.supports_ephemeral: self.status_bar.showMessage(strings._('gui_starting_server3', True)) self.app.onion.wait_for_hs(self.app.onion_host) |