From 620361fce8b3d3c274a7b2beaed199b65ac4fb41 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Fri, 27 Jul 2018 00:07:37 +0200 Subject: [PATCH] Fix accidental use of the addition assignment operator ("+="). Remove newlines from error message. --- src/init.cpp | 2 +- src/wallet/wallet.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index c7ea40817..a648785ad 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -927,7 +927,7 @@ bool AppInitParameterInteraction() // also see: InitParameterInteraction() if (!fs::is_directory(GetBlocksDir(false))) { - return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist.\n"), gArgs.GetArg("-blocksdir", "").c_str())); + return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist."), gArgs.GetArg("-blocksdir", "").c_str())); } // if using block pruning, then disallow txindex diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 3ec6aefae..9c76a8538 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4109,7 +4109,7 @@ std::shared_ptr CWallet::CreateWalletFromFile(const std::string& name, // Regenerate the keypool if upgraded to HD if (hd_upgrade) { if (!walletInstance->TopUpKeyPool()) { - InitError(_("Unable to generate keys") += "\n"); + InitError(_("Unable to generate keys")); return nullptr; } } @@ -4137,7 +4137,7 @@ std::shared_ptr CWallet::CreateWalletFromFile(const std::string& name, // Top up the keypool if (!walletInstance->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS) && !walletInstance->TopUpKeyPool()) { - InitError(_("Unable to generate initial keys") += "\n"); + InitError(_("Unable to generate initial keys")); return nullptr; }