Merge pull request #412 from sgimenez/db-transactions

Single DB transactions

diff --git a/src/wallet.cpp b/src/wallet.cpp
index f275853..2ee918f 100644 (file)
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1320,7 +1320,13 @@ vector<unsigned char> CReserveKey::GetReservedKey()
     {
         CKeyPool keypool;
         pwallet->ReserveKeyFromKeyPool(nIndex, keypool);
-        vchPubKey = keypool.vchPubKey;
+        if (nIndex != -1)
+            vchPubKey = keypool.vchPubKey;
+        else
+        {
+            printf("CReserveKey::GetReservedKey(): Warning: using default key instead of a new key, top up your keypool.");
+            vchPubKey = pwallet->vchDefaultKey;
+        }
     }
     assert(!vchPubKey.empty());
     return vchPubKey;