GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ffc4d04990 into merged_master (Bitcoin PR #20275)

Browse source 
As always, `git diff HEAD^ HEAD^2 -- <filename>` is your friend when understanding conflicts..
This commit is contained in:
Andrew Poelstra 2021-06-14 01:22:11 +00:00
commit 0cabbc6b4a
13 changed files with 143 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/interfaces.cpp
View file

@ -566,7 +566,7 @@ public:
std::vector<std::string> listWalletDir() override
{
std::vector<std::string> paths;
for (auto& path : ListWalletDir()) {
for (auto& path : ListDatabases(GetWalletDir())) {
paths.push_back(path.string());
}
return paths;