Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-14 20:32:15 -04:00
Code Issues Projects Releases Packages 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 03e38b1fae
commit dcca933d13
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
onionshare/web/receive_mode.py
View file

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