diff options
| author | Pieter Wuille <[email protected]> | 2012-04-09 13:25:17 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2012-04-09 13:25:17 -0700 |
| commit | 1a275bac2b5454ae9d6744f28c29cbf40e2fbf13 (patch) | |
| tree | 4cf7a1b4001ef82c15f4942f6a495aaf530c7d0e /src/rpcdump.cpp | |
| parent | Merge branch 'filesystem' of https://github.com/Diapolo/bitcoin (diff) | |
| parent | Do not report spurious deadlocks caused by TRY_LOCK (diff) | |
| download | discoin-1a275bac2b5454ae9d6744f28c29cbf40e2fbf13.tar.xz discoin-1a275bac2b5454ae9d6744f28c29cbf40e2fbf13.zip | |
Merge pull request #1052 from sipa/scopedlocks
Use scoped locks instead of CRITICAL_BLOCK
Diffstat (limited to 'src/rpcdump.cpp')
| -rw-r--r-- | src/rpcdump.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index 8180aadfb..5bb4789cd 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -60,9 +60,9 @@ Value importprivkey(const Array& params, bool fHelp) key.SetSecret(secret, fCompressed); CBitcoinAddress vchAddress = CBitcoinAddress(key.GetPubKey()); - CRITICAL_BLOCK(cs_main) - CRITICAL_BLOCK(pwalletMain->cs_wallet) { + LOCK2(cs_main, pwalletMain->cs_wallet); + pwalletMain->MarkDirty(); pwalletMain->SetAddressBookName(vchAddress, strLabel); |