aboutsummaryrefslogtreecommitdiff
path: root/src/rpc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/rpc.cpp')
-rw-r--r--src/rpc.cpp11
1 files changed, 4 insertions, 7 deletions
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);