diff --git a/tools/ratbagctl.devel.in b/tools/ratbagctl.devel.in index 5878460a..51d99c9b 100755 --- a/tools/ratbagctl.devel.in +++ b/tools/ratbagctl.devel.in @@ -42,6 +42,7 @@ def main(argv): argv = ["list"] cmd = None + ratbagd_process = None try: parser = toolbox.get_parser() parser.want_keepalive = True diff --git a/tools/toolbox.py b/tools/toolbox.py index 32ee1a5c..d295f90c 100644 --- a/tools/toolbox.py +++ b/tools/toolbox.py @@ -102,12 +102,16 @@ def start_ratbagd(verbosity=0): def terminate_ratbagd(ratbagd): + if ratbagd is not None: + try: + ratbagd.terminate() + ratbagd.wait(5) + except subprocess.TimeoutExpired: + ratbagd.kill() try: - ratbagd.terminate() - ratbagd.wait(5) - except subprocess.TimeoutExpired: - ratbagd.kill() - os.unlink(DBUS_CONF_PATH) + os.unlink(DBUS_CONF_PATH) + except FileNotFoundError: + pass def sync_dbus():