diff options
| author | Micah Lee <micah@micahflee.com> | 2021-05-04 20:14:45 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2021-05-04 20:14:45 -0700 |
| commit | cab96f3e39a52a40ce0421e7931441f3de0cdb2d (patch) | |
| tree | 17222855588ea8e5eca59626b0d837b3087e3dce /desktop | |
| parent | 479b01b66b1a110ad25c5cd175d91f6bd26aba4c (diff) | |
| parent | 0c4aa645cbe2987add0d411b05b7ec60b6637076 (diff) | |
| download | onionshare-cab96f3e39a52a40ce0421e7931441f3de0cdb2d.tar.gz onionshare-cab96f3e39a52a40ce0421e7931441f3de0cdb2d.zip | |
Merge branch 'develop' into version-2.3.2
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/src/onionshare/tab/mode/__init__.py | 2 | ||||
| -rw-r--r-- | desktop/src/onionshare/tab/mode/share_mode/threads.py | 3 | ||||
| -rw-r--r-- | desktop/src/onionshare/tab/tab.py | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/desktop/src/onionshare/tab/mode/__init__.py b/desktop/src/onionshare/tab/mode/__init__.py index 567dc123..16944af8 100644 --- a/desktop/src/onionshare/tab/mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/__init__.py @@ -382,7 +382,7 @@ class Mode(QtWidgets.QWidget): except Exception: # Probably we had no port to begin with (Onion service didn't start) pass - self.app.cleanup() + self.web.cleanup() self.stop_server_custom() diff --git a/desktop/src/onionshare/tab/mode/share_mode/threads.py b/desktop/src/onionshare/tab/mode/share_mode/threads.py index 74d5099a..839d30ea 100644 --- a/desktop/src/onionshare/tab/mode/share_mode/threads.py +++ b/desktop/src/onionshare/tab/mode/share_mode/threads.py @@ -47,9 +47,6 @@ class CompressThread(QtCore.QThread): self.mode.filenames, processed_size_callback=self.set_processed_size ) self.success.emit() - self.mode.app.cleanup_filenames += ( - self.mode.web.share_mode.cleanup_filenames - ) except OSError as e: self.error.emit(e.strerror) diff --git a/desktop/src/onionshare/tab/tab.py b/desktop/src/onionshare/tab/tab.py index 3d88ded5..d39cf826 100644 --- a/desktop/src/onionshare/tab/tab.py +++ b/desktop/src/onionshare/tab/tab.py @@ -668,7 +668,7 @@ class Tab(QtWidgets.QWidget): if self.close_dialog.clickedButton() == self.close_dialog.accept_button: self.common.log("Tab", "close_tab", "close, closing tab") self.get_mode().stop_server() - self.app.cleanup() + self.get_mode().web.cleanup() return True # Cancel else: @@ -681,4 +681,4 @@ class Tab(QtWidgets.QWidget): self.get_mode().web.stop(self.get_mode().app.port) self.get_mode().web_thread.quit() self.get_mode().web_thread.wait() - self.app.cleanup() + self.get_mode().web.cleanup() |