Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-03 23:15:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert the cancel feature that causes issues at least on macOS (#637)

Browse source
This commit is contained in:
Miguel Jacq 2018-02-25 12:31:32 +11:00
parent 9f0adc0fb9
commit cff267c09c
4 changed files with 13 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

15
onionshare_gui/server_status.py
View file

@ -29,7 +29,6 @@ class ServerStatus(QtWidgets.QWidget):
"""
server_started = QtCore.pyqtSignal()
server_stopped = QtCore.pyqtSignal()
server_canceled = QtCore.pyqtSignal()
button_clicked = QtCore.pyqtSignal()
url_copied = QtCore.pyqtSignal()
hidservauth_copied = QtCore.pyqtSignal()
@ -191,7 +190,7 @@ class ServerStatus(QtWidgets.QWidget):
self.server_button.setToolTip(strings._('gui_stop_server_shutdown_timeout_tooltip', True).format(self.timeout))
elif self.status == self.STATUS_WORKING:
self.server_button.setStyleSheet(button_working_style)
self.server_button.setEnabled(True)
self.server_button.setEnabled(False)
self.server_button.setText(strings._('gui_please_wait'))
if self.settings.get('shutdown_timeout'):
self.shutdown_timeout_container.hide()
@ -219,8 +218,6 @@ class ServerStatus(QtWidgets.QWidget):
self.start_server()
elif self.status == self.STATUS_STARTED:
self.stop_server()
elif self.status == self.STATUS_WORKING:
self.cancel_server()
self.button_clicked.emit()
def start_server(self):
@ -248,16 +245,6 @@ class ServerStatus(QtWidgets.QWidget):
self.update()
self.server_stopped.emit()
def cancel_server(self):
"""
Cancel the server.
"""
common.log('ServerStatus', 'cancel_server', 'Canceling the server mid-startup')
self.status = self.STATUS_WORKING
self.shutdown_timeout_reset()
self.update()
self.server_canceled.emit()
def stop_server_finished(self):
"""
The server has finished stopping.