fix checks for whether wallet uses managed bitcoind
This commit is contained in:
parent
04fac45943
commit
f8fcf7100b
@ -109,7 +109,9 @@ impl Launcher {
|
||||
if let State::Wallets { wallets, .. } = &self.state {
|
||||
let wallet_datadir = self.datadir_path.network_directory(self.network);
|
||||
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)
|
||||
} else {
|
||||
None
|
||||
|
||||
@ -187,7 +187,7 @@ impl Loader {
|
||||
) -> Task<Message> {
|
||||
match res {
|
||||
Ok((daemon, info)) => {
|
||||
if self.gui_config.start_internal_bitcoind {
|
||||
if self.start_bitcoind() {
|
||||
warn!("Lianad is external, gui will not start internal bitcoind");
|
||||
}
|
||||
return self.maybe_skip_syncing(daemon, info);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user