[Wallet] Bugfix: FRT: don't terminate when keypool is empty

8 years ago · c24a4f5981
parent 919db037f1
commit c24a4f5981
1 changed files with 5 additions and 1 deletions
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@ -2389,7 +2389,11 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                        CPubKey vchPubKey;
                        bool ret;
                        ret = reservekey.GetReservedKey(vchPubKey);
-                        assert(ret); // should never fail, as we just unlocked
+                        if (!ret)
+                        {
+                            strFailReason = _("Keypool ran out, please call keypoolrefill first");
+                            return false;
+                        }

                        scriptChange = GetScriptForDestination(vchPubKey.GetID());
                    }