From c5dfeffd4eb3198e975d566cbf3219769b6e7d93 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sat, 20 May 2017 16:59:13 +1000 Subject: [PATCH 1/2] Send stay_open variable in the right place, so that it really does stay open if we said so --- onionshare_gui/onionshare_gui.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index 6eca4507..4f34039f 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -203,7 +203,6 @@ class OnionShareGui(QtWidgets.QMainWindow): settings = Settings() settings.load() self.app.set_stealth(settings.get('use_stealth')) - web.set_stay_open(not settings.get('close_after_first_download')) # Reset web counters web.download_count = 0 @@ -221,6 +220,11 @@ class OnionShareGui(QtWidgets.QMainWindow): return # start onionshare http service in new thread + # First, load settings and configure + settings = Settings() + settings.load() + self.app.stay_open = not settings.get('close_after_first_download') + common.log('OnionShareGUI', 'stay_open', 'stay_open={}'.format(self.app.stay_open)) t = threading.Thread(target=web.start, args=(self.app.port, self.app.stay_open)) t.daemon = True t.start() From 38107404eeb24073896ae633689238f19798b573 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Tue, 23 May 2017 09:15:52 +1000 Subject: [PATCH 2/2] get settings from self rather than instantiate a new Settings object --- onionshare_gui/onionshare_gui.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index 4f34039f..de1b5c6f 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -221,9 +221,7 @@ class OnionShareGui(QtWidgets.QMainWindow): # start onionshare http service in new thread # First, load settings and configure - settings = Settings() - settings.load() - self.app.stay_open = not settings.get('close_after_first_download') + self.app.stay_open = not self.settings.get('close_after_first_download') common.log('OnionShareGUI', 'stay_open', 'stay_open={}'.format(self.app.stay_open)) t = threading.Thread(target=web.start, args=(self.app.port, self.app.stay_open)) t.daemon = True