Merge #660: fix loader: do not start bitcoind if one is running

9b154c79681a0714951092069e68dd32f527a789 fix loader: do not start bitcoind if one is running (edouard)

Pull request description:

ACKs for top commit:
  edouardparis:
    Self-ACK 9b154c79681a0714951092069e68dd32f527a789

Tree-SHA512: 13831a16d872f4fe3a83bad7bf1f0ab92e8fb32cae74b067eadd7608adf36f491e8e13572bf323927d6c537c57e77069f0fd2c9385b141d9b1cf00f5e02a538c
This commit is contained in:
edouard 2023-08-31 14:16:09 +02:00
commit 29b20972c5
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F

View File

@ -128,7 +128,8 @@ impl Loader {
start_bitcoind_and_daemon(
daemon_config_path,
self.datadir_path.clone(),
self.gui_config.start_internal_bitcoind,
self.gui_config.start_internal_bitcoind
&& self.internal_bitcoind.is_none(),
),
Message::Started,
);
@ -193,7 +194,7 @@ impl Loader {
self.gui_config.clone(),
self.datadir_path.clone(),
self.network,
self.internal_bitcoind.take(),
self.internal_bitcoind.clone(),
),
Message::Synced,
);