LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Wallet: Support loading multiple wallets if -wallet used more than once

Browse source
This commit is contained in:
Luke Dashjr 2016-09-09 08:50:09 +00:00
parent b124cf04ea
commit 0f08575be2
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet.cpp
View file

@ -3930,8 +3930,9 @@ bool CWallet::InitLoadWallet()
return true; return true;
} }
std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT); SoftSetArg("-wallet", DEFAULT_WALLET_DAT);
for (const std::string& walletFile : gArgs.GetArgs("-wallet")) {
if (boost::filesystem::path(walletFile).filename() != walletFile) { if (boost::filesystem::path(walletFile).filename() != walletFile) {
return InitError(_("-wallet parameter must only specify a filename (not a path)")); return InitError(_("-wallet parameter must only specify a filename (not a path)"));
} else if (SanitizeString(walletFile, SAFE_CHARS_FILENAME) != walletFile) { } else if (SanitizeString(walletFile, SAFE_CHARS_FILENAME) != walletFile) {
@ -3943,6 +3944,7 @@ bool CWallet::InitLoadWallet()
return false; return false;
} }
vpwallets.push_back(pwallet); vpwallets.push_back(pwallet);
}
return true; return true;
} }