Merge #936: fix panic for managed bitcoind on network change
a7b84860793a2094b9cbfe13f380f852622ab2d5 fix panic for managed bitcoind on network change (edouardparis)
Pull request description:
close #934
ACKs for top commit:
jp1ac4:
ACK a7b8486079.
Tree-SHA512: 436a71a4a62f6c06fa97be85b4a1d49e9ab1abfb0ff95dab63f5ff0ab6531fe0bcc6f84045b287660f434da01ea57fcbc2c345147d5d7970cfdbfb31e4e46200
This commit is contained in:
commit
2f50c55f79
@ -689,7 +689,10 @@ impl Step for InternalBitcoindStep {
|
|||||||
self.exe_download = Some(Download::new(0));
|
self.exe_download = Some(Download::new(0));
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
self.network = ctx.bitcoin_config.network;
|
if self.network != ctx.bitcoin_config.network {
|
||||||
|
self.internal_bitcoind_config = None;
|
||||||
|
self.network = ctx.bitcoin_config.network;
|
||||||
|
}
|
||||||
if let Some(Ok(_)) = self.started {
|
if let Some(Ok(_)) = self.started {
|
||||||
// This case can arise if a user switches from internal bitcoind to external and back to internal.
|
// This case can arise if a user switches from internal bitcoind to external and back to internal.
|
||||||
if ctx.bitcoind_config.is_none() {
|
if ctx.bitcoind_config.is_none() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user