sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 13:32:47 +01:00
Code Issues Actions Packages Projects Releases 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

22
src/wallet/wallet.cpp
View File

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