Mark keypool as used if del rec address

hyperstake · Feb 1, 2015 · b1af290 · b1af290
1 parent ddb325e
commit b1af290
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
@@ -357,7 +357,7 @@ bool AddressTableModel::removeRows(int row, int count, const QModelIndex & paren
 {
     Q_UNUSED(parent);
     AddressTableEntry *rec = priv->index(row);
-    if(count != 1 || !rec /*|| rec->type == AddressTableEntry::Receiving*/)
+    if(count != 1 || !rec )
     {
         // Can only remove one row at a time, and cannot remove rows not in model.
         // Also refuse to remove receiving addresses.
@@ -366,7 +366,10 @@ bool AddressTableModel::removeRows(int row, int count, const QModelIndex & paren
     {
         LOCK(wallet->cs_wallet);
         wallet->DelAddressBookName(CBitcoinAddress(rec->address.toStdString()).Get());
-		//CWalletDB(wallet->strWalletFile).EraseName(CBitcoinAddress(rec->address.toStdString()).Get());
+		if(rec->type == AddressTableEntry::Receiving)
+		{
+			wallet->TopUpKeyPool(); //mark existing keypool as used and refill keypool
+		}
     }
     return true;
 }

diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
@@ -1197,6 +1197,7 @@ Value deleteaddress(const Array& params, bool fHelp)
 	string strAdd = params[0].get_str();
 
 	CWalletDB(pwalletMain->strWalletFile).EraseName(strAdd);
+	pwalletMain->TopUpKeyPool();
 
 	string ret = "Success, please restart wallet if using QT";
 	return ret;