Merge branch 'mig5-fix_cancel_and_primary_action' into ux-update

This commit is contained in:
Micah Lee 2018-02-20 17:45:44 -08:00
commit 8e7515c454
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -79,6 +79,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.server_status.server_stopped.connect(self.update_server_status_indicator)
self.server_status.server_stopped.connect(self.update_primary_action)
self.server_status.server_canceled.connect(self.cancel_server)
self.server_status.server_canceled.connect(self.file_selection.server_stopped)
self.server_status.server_canceled.connect(self.update_primary_action)
self.start_server_finished.connect(self.clear_message)
self.start_server_finished.connect(self.server_status.start_server_finished)
self.start_server_finished.connect(self.update_server_status_indicator)