From a50761afc010ea420cb3d679e15b3d29dde697ea Mon Sep 17 00:00:00 2001 From: edouard Date: Fri, 25 Aug 2023 17:57:56 +0200 Subject: [PATCH] fix gui loader: stop bitcoind if running after close request close #631 --- gui/src/loader.rs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gui/src/loader.rs b/gui/src/loader.rs index 90ad112e..3d11a2a2 100644 --- a/gui/src/loader.rs +++ b/gui/src/loader.rs @@ -181,13 +181,21 @@ impl Loader { info!("Stopping internal daemon..."); daemon.stop(); info!("Internal daemon stopped"); - if self.gui_config.internal_bitcoind_exe_config.is_some() { - if let Some(daemon_config) = daemon.config() { - if let Some(bitcoind_config) = &daemon_config.bitcoind_config { - stop_internal_bitcoind(bitcoind_config); - } - } + } + } + if self.gui_config.internal_bitcoind_exe_config.is_some() { + if let Ok(daemon_config) = + Config::from_file(self.gui_config.daemon_config_path.as_ref().cloned()) + { + if let Some(bitcoind_config) = &daemon_config.bitcoind_config { + info!("Stopping liana managed bitcoind..."); + stop_internal_bitcoind(bitcoind_config); + info!("Stopped liana managed bitcoind"); + } else { + warn!("Liana daemon config does not have bitcoind config"); } + } else { + warn!("Liana gui cannot access daemon config to stop bitcoind"); } } }