2 files changed, 15 insertions, 4 deletions
diff --git a/src/wallet/ringdb.cpp b/src/wallet/ringdb.cpp
index 44992520f..3f2634c8b 100644
--- a/src/wallet/ringdb.cpp
+++ b/src/wallet/ringdb.cpp
@@ -190,7 +190,8 @@ namespace tools
 {
 
 ringdb::ringdb(std::string filename, const std::string &genesis):
-  filename(filename)
+  filename(filename),
+  env(NULL)
 {
   MDB_txn *txn;
   bool tx_active = false;
@@ -227,9 +228,18 @@ ringdb::ringdb(std::string filename, const std::string &genesis):
 
 ringdb::~ringdb()
 {
-  mdb_dbi_close(env, dbi_rings);
-  mdb_dbi_close(env, dbi_blackballs);
-  mdb_env_close(env);
+  close();
+}
+
+void ringdb::close()
+{
+  if (env)
+  {
+    mdb_dbi_close(env, dbi_rings);
+    mdb_dbi_close(env, dbi_blackballs);
+    mdb_env_close(env);
+    env = NULL;
+  }
 }
 
 bool ringdb::add_rings(const crypto::chacha_key &chacha_key, const cryptonote::transaction_prefix &tx)
diff --git a/src/wallet/ringdb.h b/src/wallet/ringdb.h
index 2bd1ac149..6b4bce124 100644
--- a/src/wallet/ringdb.h
+++ b/src/wallet/ringdb.h
@@ -41,6 +41,7 @@ namespace tools
   {
   public:
     ringdb(std::string filename, const std::string &genesis);
+    void close();
     ~ringdb();
 
     bool add_rings(const crypto::chacha_key &chacha_key, const cryptonote::transaction_prefix &tx);