[Keypool] Output different message if keypool calculation > 100%

dave-mann · dave-mann · commit 1ce879965c48 · 2019-07-31T16:39:22.000-07:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4698,7 +4698,11 @@ bool CWallet::TopUpKeyPoolCombo(unsigned int kpSize, bool fIncreaseSize)
             }
 
             double dProgress = 100.f * nEnd / (nTargetSize + 1);
-            std::string strMsg = strprintf(_("Loading wallet... (%3.2f %%)"), dProgress);
+            std::string strMsg = "";
+            if (dProgress <= 100)
+                strMsg = strprintf(_("Loading wallet... (%3.2f %%)"), dProgress);
+            else
+                strMsg = strprintf(_("Increasing keypool... (%d)"),amountExternal);
             uiInterface.InitMessage(strMsg);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -4698,7 +4698,11 @@ bool CWallet::TopUpKeyPoolCombo(unsigned int kpSize, bool fIncreaseSize)`
`4698`	`4698`	`}`
`4699`	`4699`
`4700`	`4700`	`double dProgress = 100.f * nEnd / (nTargetSize + 1);`
`4701`		`- std::string strMsg = strprintf(_("Loading wallet... (%3.2f %%)"), dProgress);`
	`4701`	`+ std::string strMsg = "";`
	`4702`	`+ if (dProgress <= 100)`
	`4703`	`+ strMsg = strprintf(_("Loading wallet... (%3.2f %%)"), dProgress);`
	`4704`	`+ else`
	`4705`	`+ strMsg = strprintf(_("Increasing keypool... (%d)"),amountExternal);`
`4702`	`4706`	`uiInterface.InitMessage(strMsg);`
`4703`	`4707`	`}`
`4704`	`4708`	`}`