nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix checks for whether wallet uses managed bitcoind

Browse Source
This commit is contained in:
Michael Mallan 2025-06-13 13:20:55 +01:00
parent 04fac45943
commit f8fcf7100b
No known key found for this signature in database
GPG Key ID: 5177CDCEDB0EABEB
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
liana-gui/src/launcher.rs
View File

@ -109,7 +109,9 @@ impl Launcher {
if let State::Wallets { wallets, .. } = &self.state { if let State::Wallets { wallets, .. } = &self.state {
let wallet_datadir = self.datadir_path.network_directory(self.network); let wallet_datadir = self.datadir_path.network_directory(self.network);
let config_path = wallet_datadir.path().join(app::config::DEFAULT_FILE_NAME); let config_path = wallet_datadir.path().join(app::config::DEFAULT_FILE_NAME);
let internal_bitcoind = if let Ok(cfg) = app::Config::from_file(&config_path) { let internal_bitcoind = if wallets[i].start_internal_bitcoind.is_some() {
wallets[i].start_internal_bitcoind
} else if let Ok(cfg) = app::Config::from_file(&config_path) {
Some(cfg.start_internal_bitcoind) Some(cfg.start_internal_bitcoind)
} else { } else {
None None

2
liana-gui/src/loader.rs
View File

@ -187,7 +187,7 @@ impl Loader {
) -> Task<Message> { ) -> Task<Message> {
match res { match res {
Ok((daemon, info)) => { Ok((daemon, info)) => {
if self.gui_config.start_internal_bitcoind { if self.start_bitcoind() {
warn!("Lianad is external, gui will not start internal bitcoind"); warn!("Lianad is external, gui will not start internal bitcoind");
} }
return self.maybe_skip_syncing(daemon, info); return self.maybe_skip_syncing(daemon, info);