Fix negative "keys left since backup" (#2671)

UdjinM6 · web-flow · commit ae70e8a34481 · 2019-02-01T12:07:03.000+03:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4262,8 +4262,10 @@ void CWallet::KeepKey(int64_t nIndex)
     if (fFileBacked)
     {
         CWalletDB walletdb(strWalletFile);
-        walletdb.ErasePool(nIndex);
-        nKeysLeftSinceAutoBackup = nWalletBackups ? nKeysLeftSinceAutoBackup - 1 : 0;
+        if (walletdb.ErasePool(nIndex))
+            --nKeysLeftSinceAutoBackup;
+        if (!nWalletBackups)
+            nKeysLeftSinceAutoBackup = 0;
     }
     LogPrintf("keypool keep %d\n", nIndex);
 }

Original file line number	Diff line number	Diff line change
`@@ -4262,8 +4262,10 @@ void CWallet::KeepKey(int64_t nIndex)`
`4262`	`4262`	`if (fFileBacked)`
`4263`	`4263`	`{`
`4264`	`4264`	`CWalletDB walletdb(strWalletFile);`
`4265`		`- walletdb.ErasePool(nIndex);`
`4266`		`- nKeysLeftSinceAutoBackup = nWalletBackups ? nKeysLeftSinceAutoBackup - 1 : 0;`
	`4265`	`+ if (walletdb.ErasePool(nIndex))`
	`4266`	`+ --nKeysLeftSinceAutoBackup;`
	`4267`	`+ if (!nWalletBackups)`
	`4268`	`+ nKeysLeftSinceAutoBackup = 0;`
`4267`	`4269`	`}`
`4268`	`4270`	`LogPrintf("keypool keep %d\n", nIndex);`
`4269`	`4271`	`}`