diff options
| author | Chun Kuan Lee <ken2812221@gmail.com> | 2018-11-08 11:41:56 +0800 |
|---|---|---|
| committer | João Barbosa <joao.paulo.barbosa@gmail.com> | 2019-03-11 21:54:44 +0000 |
| commit | 0a9af2d4cb093d254a36d094b8d8ed7603fc9404 (patch) | |
| tree | b03cb19c110d025b88f863dcf1b59480d788990b | |
| parent | 7751ea37b65cae2cff766d09b2c95770aa7d71d8 (diff) | |
| download | bitcoin-0a9af2d4cb093d254a36d094b8d8ed7603fc9404.tar.xz | |
wallet: Create IsDatabaseLoaded function
Github-Pull: #14552
Rebased-From: 5912031
| -rw-r--r-- | src/wallet/db.cpp | 3 | ||||
| -rw-r--r-- | 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; } /** |