From abec0b037ba2aa37d6deeb807cabb1f9012aeb08 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Thu, 9 Nov 2017 11:46:26 +1100 Subject: [PATCH] more UI fixes - hide checkbox if server is working/started and it was not checked. Ensure we only set the timer if the timeout checkbox was checked to begin with --- onionshare_gui/server_status.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py index c6facdba..7e6a6488 100644 --- a/onionshare_gui/server_status.py +++ b/onionshare_gui/server_status.py @@ -152,6 +152,12 @@ class ServerStatus(QtWidgets.QVBoxLayout): self.server_button.setEnabled(True) self.server_button.setText(strings._('gui_stop_server', True)) self.server_shutdown_timeout.setEnabled(False) + self.server_shutdown_timeout_checkbox.hide() + elif self.status == self.STATUS_WORKING: + self.server_button.setEnabled(False) + self.server_button.setText(strings._('gui_please_wait')) + self.server_shutdown_timeout.setEnabled(False) + self.server_shutdown_timeout_checkbox.hide() else: self.server_button.setEnabled(False) self.server_button.setText(strings._('gui_please_wait')) @@ -179,13 +185,14 @@ class ServerStatus(QtWidgets.QVBoxLayout): The server has finished starting. """ self.status = self.STATUS_STARTED - # Convert the date value to seconds between now and then - now = QtCore.QDateTime.currentDateTime() - self.timeout = now.secsTo(self.server_shutdown_timeout.dateTime()) - # Set the shutdown timeout value - if self.timeout > 0: - self.app.shutdown_timer = common.close_after_seconds(self.timeout) - self.app.shutdown_timer.start() + if self.server_shutdown_timeout_checkbox.isChecked(): + # Convert the date value to seconds between now and then + now = QtCore.QDateTime.currentDateTime() + self.timeout = now.secsTo(self.server_shutdown_timeout.dateTime()) + # Set the shutdown timeout value + if self.timeout > 0: + self.app.shutdown_timer = common.close_after_seconds(self.timeout) + self.app.shutdown_timer.start() self.copy_url() self.update()