Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-12 15:59:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

When quitting OnionShare with services started, make sure the web services get stopped

Browse Source
This commit is contained in:
Micah Lee 2020-11-27 12:38:00 -08:00
parent f69cbbd389
commit 184f126189
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/src/onionshare/main_window.py
View File

@ -285,6 +285,7 @@ class MainWindow(QtWidgets.QMainWindow):
e.accept()
def cleanup(self):
self.common.log("MainWindow", "cleanup")
self.tabs.cleanup()
self.common.gui.onion.cleanup()

2
desktop/src/onionshare/tab/tab.py
View File

@ -663,7 +663,9 @@ class Tab(QtWidgets.QWidget):
return False
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()
self.app.cleanup()

2
desktop/src/onionshare/tab_widget.py
View File

@ -81,6 +81,8 @@ class TabWidget(QtWidgets.QTabWidget):
self.event_handler_t.start()
def cleanup(self):
self.common.log("TabWidget", "cleanup")
# Stop the event thread
self.event_handler_t.should_quit = True
self.event_handler_t.quit()