diff --git a/gui/src/bitcoind.rs b/gui/src/bitcoind.rs index 02606f15..2f158e1b 100644 --- a/gui/src/bitcoind.rs +++ b/gui/src/bitcoind.rs @@ -69,6 +69,7 @@ pub fn stop_internal_bitcoind(bitcoind_config: &BitcoindConfig) { Ok(bitcoind) => { info!("Stopping internal bitcoind..."); bitcoind.stop(); + info!("Stopped liana managed bitcoind"); } Err(e) => { warn!("Could not create interface to internal bitcoind: '{}'.", e); diff --git a/gui/src/loader.rs b/gui/src/loader.rs index 90ad112e..351274b9 100644 --- a/gui/src/loader.rs +++ b/gui/src/loader.rs @@ -181,13 +181,19 @@ 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 { + stop_internal_bitcoind(bitcoind_config); + } else { + warn!("Liana daemon config does not have bitcoind config"); } + } else { + warn!("Liana gui cannot access daemon config to stop bitcoind"); } } }