Merge #18091: Qt: pass clientmodel changes from walletframe to walletviews

laanwj · laanwj · commit 407d7c831aab · 2020-02-10T12:24:15.000+01:00
2af3e16 Qt: pass clientmodel changes from walletframe to walletviews (Jonas Schnelli) Pull request description: Fixes #18090 We currently don't pass `clientmodel` changes from the `walletframe` to the `walletviews` leading to possible invalid access during shutdown because all walletviews miss the nullifying of the clientmodel. TODO: needs investigation if this is should be backported. ACKs for top commit: laanwj: Good catch, code review ACK 2af3e16 Tree-SHA512: f8c0a114f01deac07fb311112d144f3bfc1c1882dd19e8742b372dd597d7a5d59cd0af99fc50494de2334cad98d6701675317474e40fe8820d04c058aeca1b75
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
@@ -37,6 +37,10 @@ WalletFrame::~WalletFrame()
 void WalletFrame::setClientModel(ClientModel *_clientModel)
 {
     this->clientModel = _clientModel;
+
+    for (auto i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) {
+        i.value()->setClientModel(_clientModel);
+    }
 }
 
 bool WalletFrame::addWallet(WalletModel *walletModel)

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ WalletFrame::~WalletFrame()`
`37`	`37`	`void WalletFrame::setClientModel(ClientModel *_clientModel)`
`38`	`38`	`{`
`39`	`39`	`this->clientModel = _clientModel;`
	`40`	`+`
	`41`	`+ for (auto i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) {`
	`42`	`+ i.value()->setClientModel(_clientModel);`
	`43`	`+ }`
`40`	`44`	`}`
`41`	`45`
`42`	`46`	`bool WalletFrame::addWallet(WalletModel *walletModel)`