From f8dcd5ca6f55ad49807cf7491c1f153f6158400e Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 6 Apr 2012 18:39:12 +0200
Subject: Use scoped locks instead of CRITICAL_BLOCK

---
 src/rpcdump.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/rpcdump.cpp')

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);
 
-- 
cgit v1.2.3