From 2f4c30fd85aed8227612ee9986226850723c6860 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Thu, 1 Sep 2011 18:40:18 -0400 Subject: Fix bad merge: getaccountaddress was broken for new accounts --- src/rpc.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/rpc.cpp b/src/rpc.cpp index ec2bb2a97a..4f4342770c 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -379,14 +379,11 @@ CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false) // Generate a new key if (account.vchPubKey.empty() || bForceNew || bKeyUsed) { - if (pwalletMain->GetKeyPoolSize() < 1) - { - if (!pwalletMain->GetKeyFromPool(account.vchPubKey, false)) - throw JSONRPCError(-12, "Error: Keypool ran out, please call keypoolrefill first"); + if (!pwalletMain->GetKeyFromPool(account.vchPubKey, false)) + throw JSONRPCError(-12, "Error: Keypool ran out, please call keypoolrefill first"); - pwalletMain->SetAddressBookName(CBitcoinAddress(account.vchPubKey), strAccount); - walletdb.WriteAccount(strAccount, account); - } + pwalletMain->SetAddressBookName(CBitcoinAddress(account.vchPubKey), strAccount); + walletdb.WriteAccount(strAccount, account); } return CBitcoinAddress(account.vchPubKey); -- cgit v1.2.3