From 0a9af2d4cb093d254a36d094b8d8ed7603fc9404 Mon Sep 17 00:00:00 2001 From: Chun Kuan Lee Date: Thu, 8 Nov 2018 11:41:56 +0800 Subject: wallet: Create IsDatabaseLoaded function Github-Pull: #14552 Rebased-From: 5912031 --- src/wallet/db.cpp | 3 +-- src/wallet/db.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index f7ffd0d6bf..2d841ff8fd 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -80,8 +80,7 @@ bool IsWalletLoaded(const fs::path& wallet_path) LOCK(cs_db); auto env = g_dbenvs.find(env_directory.string()); if (env == g_dbenvs.end()) return false; - auto db = env->second.m_databases.find(database_filename); - return db != env->second.m_databases.end(); + return env->second.IsDatabaseLoaded(database_filename); } BerkeleyEnvironment* GetWalletEnv(const fs::path& wallet_path, std::string& database_filename) diff --git a/src/wallet/db.h b/src/wallet/db.h index dd549bc463..6af37c12cd 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -56,6 +56,7 @@ public: void MakeMock(); bool IsMock() const { return fMockDb; } bool IsInitialized() const { return fDbEnvInit; } + bool IsDatabaseLoaded(const std::string& db_filename) const { return m_databases.find(db_filename) != m_databases.end(); } fs::path Directory() const { return strPath; } /** -- cgit v1.2.3