Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-07-27 00:25:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

only prevent the share from starting when the timeout has expired, if the timeout feature was even set at all

Browse source
This commit is contained in:
Miguel Jacq 2017-11-09 18:23:11 +11:00
parent 183b149bc6
commit d6324080ac
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
onionshare_gui/onionshare_gui.py
View file

@ -387,7 +387,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
# If the auto-shutdown timer has stopped, stop the server
if self.server_status.status == self.server_status.STATUS_STARTED:
if self.app.shutdown_timer and self.server_status.timer_enabled and self.timeout > 0:
if self.app.shutdown_timer and self.server_status.timer_enabled:
if self.timeout > 0:
if not self.app.shutdown_timer.is_alive():
self.stop_server()
self.status_bar.showMessage(strings._('close_on_timeout',True))

3
onionshare_gui/server_status.py
View file

@ -186,6 +186,7 @@ class ServerStatus(QtWidgets.QVBoxLayout):
Toggle starting or stopping the server.
"""
if self.status == self.STATUS_STOPPED:
if self.timer_enabled:
# Get the timeout chosen, stripped of its seconds. This prevents confusion if the share stops at (say) 37 seconds past the minute chosen
self.timeout = self.server_shutdown_timeout.dateTime().toPyDateTime().replace(second=0, microsecond=0)
# If the timeout has actually passed already before the user hit Start, refuse to start the server.
@ -193,6 +194,8 @@ class ServerStatus(QtWidgets.QVBoxLayout):
Alert(strings._('gui_server_timeout_expired', QtWidgets.QMessageBox.Warning))
else:
self.start_server()
else:
self.start_server()
elif self.status == self.STATUS_STARTED:
self.stop_server()
self.shutdown_timeout_reset()