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

Merge branch '468_canceled_feedback_on_stopped_server' of https://github.com/mig5/onionshare into mig5-468_canceled_feedback_on_stopped_server

Browse source
This commit is contained in:
Micah Lee 2017-12-01 11:44:33 -08:00
commit c664a9d3aa
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
onionshare_gui/onionshare_gui.py
View file

@ -376,9 +376,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
if self.new_download: if self.new_download:
self.vbar.setValue(self.vbar.maximum()) self.vbar.setValue(self.vbar.maximum())
self.new_download = False self.new_download = False
# only check for requests if the server is running
if self.server_status.status != self.server_status.STATUS_STARTED:
return
events = [] events = []
@ -415,6 +412,9 @@ class OnionShareGui(QtWidgets.QMainWindow):
# close on finish? # close on finish?
if not web.get_stay_open(): if not web.get_stay_open():
self.server_status.stop_server() self.server_status.stop_server()
else:
if self.server_status.status == self.server_status.STATUS_STOPPED:
self.downloads.cancel_download(event["data"]["id"])
elif event["type"] == web.REQUEST_CANCELED: elif event["type"] == web.REQUEST_CANCELED:
self.downloads.cancel_download(event["data"]["id"]) self.downloads.cancel_download(event["data"]["id"])