almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

When canceling the docker installer, reject the dialog immediately before quitting the threads, and try to gracefully quit the threads

Browse source
This commit is contained in:
Micah Lee 2020-02-07 15:36:21 -08:00
parent 329fa4639b
commit b04b6ee96c
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dangerzone/docker_installer.py
View file

@ -153,12 +153,13 @@ class DockerInstaller(QtWidgets.QDialog):
subprocess.Popen(["open", "-a", "Docker.app"])
def cancel_clicked(self):
if self.download_t:
self.download_t.terminate()
if self.install_t:
self.install_t.terminate()
self.reject()
if self.download_t:
self.download_t.quit()
if self.install_t:
self.install_t.quit()
def start(self):
if not os.path.isdir("/Applications/Docker.app"):
self.download()