mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-12-08 03:33:32 +01:00
Merge #8694: Basic multiwallet support
c237bd7wallet: Update formatting (Luke Dashjr)9cbe8c8wallet: Forbid -salvagewallet, -zapwallettxes, and -upgradewallet with multiple wallets (Luke Dashjr)a2a5f3fwallet: Base backup filenames on original wallet filename (Luke Dashjr)b823a4cwallet: Include actual backup filename in recovery warning message (Luke Dashjr)84dcb45Bugfix: wallet: Fix warningStr, errorStr argument order (Luke Dashjr)008c360Wallet: Move multiwallet sanity checks to CWallet::Verify, and do other checks on all wallets (Luke Dashjr)0f08575Wallet: Support loading multiple wallets if -wallet used more than once (Luke Dashjr)b124cf0Wallet: Replace pwalletMain with a vector of wallet pointers (Luke Dashjr)19b3648CWalletDB: Store the update counter per wallet (Luke Dashjr)74e8738Bugfix: ForceSetArg should replace entr(ies) in mapMultiArgs, not append (Luke Dashjr)23fb9adwallet: Move nAccountingEntryNumber from static/global to CWallet (Luke Dashjr)9d15d55Bugfix: wallet: Increment "update counter" when modifying account stuff (Luke Dashjr)f28eb80Bugfix: wallet: Increment "update counter" only after actually making the applicable db changes to avoid potential races (Luke Dashjr) Tree-SHA512: 23f5dda58477307bc07997010740f1dc729164cdddefd2f9a2c9c7a877111eb1516d3e2ad4f9b104621f0b7f17369c69fcef13d28b85cb6c01d35f09a8845f23
This commit is contained in:
@@ -474,6 +474,7 @@ void ArgsManager::ForceSetArg(const std::string& strArg, const std::string& strV
|
||||
{
|
||||
LOCK(cs_args);
|
||||
mapArgs[strArg] = strValue;
|
||||
mapMultiArgs[strArg].clear();
|
||||
mapMultiArgs[strArg].push_back(strValue);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user