phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-25 18:52:58 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ReceiveMode was overloading timer_callback instead of timer_callback_custom

Browse source
This commit is contained in:
Micah Lee 2018-04-28 13:41:15 -07:00
parent 74a799f0c1
commit c1413ad7da
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
onionshare_gui/mode.py
View file

@ -86,15 +86,10 @@ class Mode(QtWidgets.QWidget):
""" """
This method is called regularly on a timer. This method is called regularly on a timer.
""" """
self.common.log('Mode', 'timer_callback')
# If the auto-shutdown timer has stopped, stop the server # If the auto-shutdown timer has stopped, stop the server
print(self.server_status.status) ## HERE IS THE PROBLEM, self.server_status.status isn't getting updated
if self.server_status.status == ServerStatus.STATUS_STARTED: if self.server_status.status == ServerStatus.STATUS_STARTED:
print('debug1')
if self.app.shutdown_timer and self.common.settings.get('shutdown_timeout'): if self.app.shutdown_timer and self.common.settings.get('shutdown_timeout'):
print('debug2')
if self.timeout > 0: if self.timeout > 0:
print('debug3')
now = QtCore.QDateTime.currentDateTime() now = QtCore.QDateTime.currentDateTime()
seconds_remaining = now.secsTo(self.server_status.timeout) seconds_remaining = now.secsTo(self.server_status.timeout)

11
onionshare_gui/receive_mode/__init__.py
View file

@ -51,12 +51,15 @@ class ReceiveMode(Mode):
# Layout # Layout
self.layout.insertWidget(0, self.receive_info) self.layout.insertWidget(0, self.receive_info)
def timer_callback(self): def timer_callback_custom(self):
""" """
This method is called regularly on a timer while receive mode is active. This method is called regularly on a timer while share mode is active.
""" """
pass # Scroll to the bottom of the download progress bar log pane if a new download has been added
#if self.new_download:
# self.downloads.downloads_container.vbar.setValue(self.downloads.downloads_container.vbar.maximum())
# self.new_download = False
def get_stop_server_shutdown_timeout_text(self): def get_stop_server_shutdown_timeout_text(self):
""" """