From 9b78f3ce8ed1867c37f6b9fff98f74582d44b789 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Thu, 11 Jun 2020 16:24:17 -0400 Subject: [PATCH] walletutil: Wallets can also be sqlite --- src/wallet/walletutil.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp index 23cdb8f64cd..a2a55f9751e 100644 --- a/src/wallet/walletutil.cpp +++ b/src/wallet/walletutil.cpp @@ -8,6 +8,7 @@ #include bool ExistsBerkeleyDatabase(const fs::path& path); +bool ExistsSQLiteDatabase(const fs::path& path); fs::path GetWalletDir() { @@ -48,7 +49,8 @@ std::vector ListWalletDir() // This can be replaced by boost::filesystem::lexically_relative once boost is bumped to 1.60. const fs::path path = it->path().string().substr(offset); - if (it->status().type() == fs::directory_file && ExistsBerkeleyDatabase(it->path())) { + if (it->status().type() == fs::directory_file && + (ExistsBerkeleyDatabase(it->path()) || ExistsSQLiteDatabase(it->path()))) { // Found a directory which contains wallet.dat btree file, add it as a wallet. paths.emplace_back(path); } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && ExistsBerkeleyDatabase(it->path())) {