diff options
| author | Micah Lee <micah@micahflee.com> | 2019-02-17 10:08:01 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2019-02-17 10:08:01 -0800 |
| commit | aaa4e239de906c6412d83b1d5ffa7d0ed0c16417 (patch) | |
| tree | 611d64eda251b4485a8c928ad3d1146526f0de03 /onionshare | |
| parent | 422179a6b58210fff34d78994e6069c2924a0997 (diff) | |
| parent | 41f5800e0eba7266dd1843ded9761afea902b615 (diff) | |
| download | onionshare-aaa4e239de906c6412d83b1d5ffa7d0ed0c16417.tar.gz onionshare-aaa4e239de906c6412d83b1d5ffa7d0ed0c16417.zip | |
Merge branch 'develop' into 899_send_files_ajax
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 16c433ee..fa9909ae 100644 --- a/onionshare/web/receive_mode.py +++ b/onionshare/web/receive_mode.py @@ -361,14 +361,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 @@ -391,7 +391,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 |