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

Merge 1884ce2f4c into merged_master (Bitcoin PR bitcoin/bitcoin#22937)

Browse source
This commit is contained in:
Byron Hambly 2023-05-11 11:35:30 +00:00
commit 2b8eef42dd
45 changed files with 348 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/interfaces.cpp
View file

@ -565,13 +565,13 @@ public:
}
std::string getWalletDir() override
{
return GetWalletDir().string();
return fs::PathToString(GetWalletDir());
}
std::vector<std::string> listWalletDir() override
{
std::vector<std::string> paths;
for (auto& path : ListDatabases(GetWalletDir())) {
paths.push_back(path.string());
paths.push_back(fs::PathToString(path));
}
return paths;
}