From b04b6ee96c6035b2f25a4697ac23effb7e337b95 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Fri, 7 Feb 2020 15:36:21 -0800 Subject: [PATCH] When canceling the docker installer, reject the dialog immediately before quitting the threads, and try to gracefully quit the threads --- dangerzone/docker_installer.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dangerzone/docker_installer.py b/dangerzone/docker_installer.py index 709eb9a..eb1a1ea 100644 --- a/dangerzone/docker_installer.py +++ b/dangerzone/docker_installer.py @@ -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()