From 05f00ca53fd36fee2e036045bb0a042cf6279789 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Thu, 10 Jun 2021 14:46:31 -0700 Subject: [PATCH] Fix bugs with testing if docker is ready --- dangerzone/gui/common.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dangerzone/gui/common.py b/dangerzone/gui/common.py index 28b614f..cbf29bf 100644 --- a/dangerzone/gui/common.py +++ b/dangerzone/gui/common.py @@ -202,7 +202,7 @@ class GuiCommon(object): return True def ensure_docker_service_is_started(self): - if not is_docker_ready(self): + if not is_docker_ready(self.global_common): message = "Dangerzone requires Docker

Docker should be installed, but it looks like it's not running in the background.

Click Ok to try starting the docker service. You will have to type your login password." if ( Alert(self, self.global_common, message).launch() @@ -218,7 +218,7 @@ class GuiCommon(object): ) if p.returncode == 0: # Make sure docker is now ready - if is_docker_ready(self): + if is_docker_ready(self.global_common): return True else: message = "Restarting docker appeared to work, but the service still isn't responding, quitting." @@ -234,7 +234,7 @@ class GuiCommon(object): class Alert(QtWidgets.QDialog): def __init__( - self, global_common, gui_common, message, ok_text="Ok", extra_button_text=None + self, gui_common, global_common, message, ok_text="Ok", extra_button_text=None ): super(Alert, self).__init__() self.global_common = global_common