diff options
| author | Micah Lee <micah@micahflee.com> | 2021-12-01 20:34:54 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2021-12-01 20:34:54 -0800 |
| commit | 8ec9a24af1402b0c86b1e811b5e6925d39d3bcdb (patch) | |
| tree | 87ff2a9989ce5acb278590c103746dc31e536e56 /desktop/src | |
| parent | 109d63a10c90c656409c6a3d66e146becc151b0b (diff) | |
| download | onionshare-8ec9a24af1402b0c86b1e811b5e6925d39d3bcdb.tar.gz onionshare-8ec9a24af1402b0c86b1e811b5e6925d39d3bcdb.zip | |
Explicitly cleanup temp files and dirs
Diffstat (limited to 'desktop/src')
| -rw-r--r-- | desktop/src/onionshare/tab/tab.py | 13 | ||||
| -rw-r--r-- | desktop/src/onionshare/tab_widget.py | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/desktop/src/onionshare/tab/tab.py b/desktop/src/onionshare/tab/tab.py index 2e592771..b0aa25df 100644 --- a/desktop/src/onionshare/tab/tab.py +++ b/desktop/src/onionshare/tab/tab.py @@ -660,9 +660,6 @@ class Tab(QtWidgets.QWidget): # Close 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.get_mode().web.cleanup() return True # Cancel else: @@ -671,8 +668,10 @@ class Tab(QtWidgets.QWidget): def cleanup(self): self.common.log("Tab", "cleanup", f"tab_id={self.tab_id}") - if self.get_mode() and self.get_mode().web_thread: - self.get_mode().web.stop(self.get_mode().app.port) - self.get_mode().web_thread.quit() - self.get_mode().web_thread.wait() + if self.get_mode(): + if self.get_mode().web_thread: + self.get_mode().web.stop(self.get_mode().app.port) + self.get_mode().web_thread.quit() + self.get_mode().web_thread.wait() + self.get_mode().web.cleanup() diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py index 7162fcc4..c43a9b9a 100644 --- a/desktop/src/onionshare/tab_widget.py +++ b/desktop/src/onionshare/tab_widget.py @@ -316,6 +316,7 @@ class TabWidget(QtWidgets.QTabWidget): self.common.log("TabWidget", "closing a service tab") if tab.close_tab(): self.common.log("TabWidget", "user is okay with closing the tab") + tab.cleanup() # If the tab is persistent, delete the settings file from disk if tab.settings.get("persistent", "enabled"): |