diff --git a/onionshare/common.py b/onionshare/common.py index 218d5e6c..d51fcbaf 100644 --- a/onionshare/common.py +++ b/onionshare/common.py @@ -225,7 +225,7 @@ def dir_size(start_path): return total_size -class close_after_seconds(threading.Thread): +class ShutdownTimer(threading.Thread): """ Background thread sleeps t hours and returns. """ diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py index 85bfaf22..02da4b62 100644 --- a/onionshare/onionshare.py +++ b/onionshare/onionshare.py @@ -21,6 +21,7 @@ along with this program. If not, see . import os, shutil from . import common, strings +from .common import ShutdownTimer class OnionShare(object): """ @@ -74,7 +75,7 @@ class OnionShare(object): return if self.shutdown_timeout > 0: - self.shutdown_timer = common.close_after_seconds(self.shutdown_timeout) + self.shutdown_timer = ShutdownTimer(self.shutdown_timeout) self.onion_host = self.onion.start_onion_service(self.port) diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index 947499ed..3e7addce 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -24,6 +24,7 @@ import queue from PyQt5 import QtCore, QtWidgets, QtGui from onionshare import strings, common +from onionshare.common import ShutdownTimer from onionshare.settings import Settings from onionshare.onion import * @@ -468,7 +469,7 @@ class OnionShareGui(QtWidgets.QMainWindow): self.timeout = now.secsTo(self.server_status.timeout) # Set the shutdown timeout value if self.timeout > 0: - self.app.shutdown_timer = common.close_after_seconds(self.timeout) + self.app.shutdown_timer = ShutdownTimer(self.timeout) self.app.shutdown_timer.start() # The timeout has actually already passed since the user clicked Start. Probably the Onion service took too long to start. else: