aboutsummaryrefslogtreecommitdiff
path: root/src/qt/paymentserver.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2014-01-06 13:36:51 +0100
committerWladimir J. van der Laan <[email protected]>2014-01-06 13:37:12 +0100
commit37d30ec3cf51aa332ce95ecf52fdd3e8e3d7228b (patch)
treef8002c42fa4062606197564710595654a7be42ba /src/qt/paymentserver.cpp
parentMerge pull request #3401 (diff)
parentqt: Add missing lock in WalletModel::listCoins (diff)
downloaddiscoin-37d30ec3cf51aa332ce95ecf52fdd3e8e3d7228b.tar.xz
discoin-37d30ec3cf51aa332ce95ecf52fdd3e8e3d7228b.zip
Merge pull request #3413
d31ad26 qt: Add missing lock in WalletModel::listCoins (Wladimir J. van der Laan) 28352af qt: protect SetAddressBook with cs_wallet lock everywhere (Wladimir J. van der Laan) aaf8d15 qt: Add missing LOCKs for locked coin functions (Wladimir J. van der Laan) 4757e92 qt: add missing cs_wallet lock in AddressTableModel::setData (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt/paymentserver.cpp')
-rw-r--r--src/qt/paymentserver.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index ba5c06064..cfa87c16b 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -548,6 +548,7 @@ void PaymentServer::fetchPaymentACK(CWallet* wallet, SendCoinsRecipient recipien
else {
CPubKey newKey;
if (wallet->GetKeyFromPool(newKey)) {
+ LOCK(wallet->cs_wallet); // SetAddressBook
CKeyID keyID = newKey.GetID();
wallet->SetAddressBook(keyID, strAccount, "refund");