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

Merge master branch and fix conflicts

Browse source
This commit is contained in:
Miguel Jacq 2017-12-03 17:06:33 +11:00
commit f6763b25ef
15 changed files with 128 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
onionshare_gui/onionshare_gui.py
View file

@ -434,6 +434,9 @@ class OnionShareGui(QtWidgets.QMainWindow):
if not web.get_stay_open():
self.server_status.stop_server()
self.server_status.shutdown_timeout_reset()
else:
if self.server_status.status == self.server_status.STATUS_STOPPED:
self.downloads.cancel_download(event["data"]["id"])
elif event["type"] == web.REQUEST_CANCELED:
download_in_progress = False