diff options
author | Miguel Jacq <mig@mig5.net> | 2019-02-17 15:49:37 +1100 |
---|---|---|
committer | Miguel Jacq <mig@mig5.net> | 2019-02-17 15:49:37 +1100 |
commit | 51e98f40e717a4413427ef3aab4da9839c7c6bea (patch) | |
tree | c5f6354dbd8f8c2c38082e1da97196d052fc4759 /onionshare | |
parent | 1dbd82f74a72c8e786c798219c93a15efb8c9df1 (diff) | |
download | onionshare-51e98f40e717a4413427ef3aab4da9839c7c6bea.tar.gz onionshare-51e98f40e717a4413427ef3aab4da9839c7c6bea.zip |
Update the GUI when the browser has canceled an upload in Receive Mode. Don't increment the completed counter
Diffstat (limited to 'onionshare')
-rw-r--r-- | onionshare/web/receive_mode.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/onionshare/web/receive_mode.py b/onionshare/web/receive_mode.py index 566946f2..a0cf5934 100644 --- a/onionshare/web/receive_mode.py +++ b/onionshare/web/receive_mode.py @@ -332,14 +332,14 @@ class ReceiveModeRequest(Request): self.told_gui_about_request = True - filename = secure_filename(filename) + self.filename = secure_filename(filename) - self.progress[filename] = { + self.progress[self.filename] = { 'uploaded_bytes': 0, 'complete': False } - f = ReceiveModeFile(self, filename, self.file_write_func, self.file_close_func) + f = ReceiveModeFile(self, self.filename, self.file_write_func, self.file_close_func) if f.upload_error: self.web.common.log('ReceiveModeRequest', '_get_file_stream', 'Error creating file') self.upload_error = True @@ -362,7 +362,7 @@ class ReceiveModeRequest(Request): if self.told_gui_about_request: upload_id = self.upload_id - if not self.web.stop_q.empty(): + if not self.web.stop_q.empty() or not self.progress[self.filename]['complete']: # Inform the GUI that the upload has canceled self.web.add_request(self.web.REQUEST_UPLOAD_CANCELED, self.path, { 'id': upload_id |