mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-18 13:17:55 +02:00
Merge 776d48dd56 into merged_master (Bitcoin PR bitcoin-core/gui#801)
This commit is contained in:
commit
8dfb84eddd
5 changed files with 31 additions and 29 deletions
|
|
@ -365,6 +365,11 @@ void BitcoinApplication::requestShutdown()
|
|||
// Request node shutdown, which can interrupt long operations, like
|
||||
// rescanning a wallet.
|
||||
node().startShutdown();
|
||||
// Prior to unsetting the client model, stop listening backend signals
|
||||
if (clientModel) {
|
||||
clientModel->stop();
|
||||
}
|
||||
|
||||
// Unsetting the client model can cause the current thread to wait for node
|
||||
// to complete an operation, like wait for a RPC execution to complete.
|
||||
window->setClientModel(nullptr);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue