Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-26 22:37:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Oops, finish resolving merge conflict

Browse Source
This commit is contained in:
Micah Lee 2019-01-21 17:32:58 -08:00
parent f4cd49e9dc
commit 2fcedb8730
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
onionshare/web/receive_mode.py
View File

@ -347,29 +347,21 @@ class ReceiveModeRequest(Request):
self.web.common.log('ReceiveModeRequest', 'close')
try:
<<<<<<< HEAD
upload_id = self.upload_id
if not self.web.stop_q.empty():
# Inform the GUI that the upload has canceled
self.web.add_request(self.web.REQUEST_UPLOAD_CANCELED, self.path, {
'id': upload_id
})
else:
=======
if self.told_gui_about_request:
upload_id = self.upload_id
>>>>>>> develop
# Inform the GUI that the upload has finished
self.web.add_request(self.web.REQUEST_UPLOAD_FINISHED, self.path, {
'id': upload_id
})
<<<<<<< HEAD
self.web.receive_mode.uploads_in_progress.remove(upload_id)
=======
if not self.web.stop_q.empty():
# Inform the GUI that the upload has canceled
self.web.add_request(self.web.REQUEST_UPLOAD_CANCELED, self.path, {
'id': upload_id
})
else:
# Inform the GUI that the upload has finished
self.web.add_request(self.web.REQUEST_UPLOAD_FINISHED, self.path, {
'id': upload_id
})
self.web.receive_mode.uploads_in_progress.remove(upload_id)
>>>>>>> develop
except AttributeError:
pass