diff options
| author | Micah Lee <micah@micahflee.com> | 2019-01-21 17:32:58 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2019-01-21 17:32:58 -0800 |
| commit | 2fcedb8730c70e15e940dee9d2e346b46574a20f (patch) | |
| tree | e9ae04096e22a86cf91e266f90f034cfa7572ad5 | |
| parent | f4cd49e9dcce92f65dd881c38a7101f39ed19075 (diff) | |
| download | onionshare-2fcedb8730c70e15e940dee9d2e346b46574a20f.tar.gz onionshare-2fcedb8730c70e15e940dee9d2e346b46574a20f.zip | |
Oops, finish resolving merge conflict
| -rw-r--r-- | onionshare/web/receive_mode.py | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/onionshare/web/receive_mode.py b/onionshare/web/receive_mode.py index 450417f6..6124ecf1 100644 --- a/onionshare/web/receive_mode.py +++ b/onionshare/web/receive_mode.py @@ -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 |