Fix bad merge: getaccountaddress was broken for new accounts

src/rpc.cpp

@@ -378,8 +378,6 @@ 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");
@@ -387,7 +385,6 @@ CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false)
         pwalletMain->SetAddressBookName(CBitcoinAddress(account.vchPubKey), strAccount);
         walletdb.WriteAccount(strAccount, account);
     }
-    }
 
     return CBitcoinAddress(account.vchPubKey);
 }