1 files changed, 11 insertions, 3 deletions

diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 6539eb0..1efffc4 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -156,8 +156,8 @@ void Storage::NamedDatabase::remove(const QByteArray &k, const QByteArray &value
                      const std::function<void(const Storage::Error &error)> &errorHandler)
 {
     if (!d || !d->transaction) {
-        Error error(d->name.toLatin1() + d->db, ErrorCodes::GenericError, "Not open");
         if (d) {
+            Error error(d->name.toLatin1() + d->db, ErrorCodes::GenericError, "Not open");
             errorHandler ? errorHandler(error) : d->defaultErrorHandler(error);
         }
         return;
@@ -443,8 +443,8 @@ Storage::NamedDatabase Storage::Transaction::openDatabase(const QByteArray &db,
     d->implicitCommit = true;
     auto p = new Storage::NamedDatabase::Private(db, allowDuplicates, d->defaultErrorHandler, d->name, d->transaction);
     if (!p->openDatabase(d->requestedRead, errorHandler)) {
-        return Storage::NamedDatabase();
         delete p;
+        return Storage::NamedDatabase();
     }
     return Storage::NamedDatabase(p);
 }
@@ -463,7 +463,7 @@ QList<QByteArray> Storage::Transaction::getDatabaseNames() const
         MDB_val data;
         MDB_cursor *cursor;
 
-        rc = mdb_cursor_open(d->transaction, d->dbi, &cursor);
+        mdb_cursor_open(d->transaction, d->dbi, &cursor);
         if ((rc = mdb_cursor_get(cursor, &key, &data, MDB_FIRST)) == 0) {
             list << QByteArray::fromRawData((char*)key.mv_data, key.mv_size);
             while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
@@ -615,4 +615,12 @@ void Storage::removeFromDisk() const
     mdb_env_close(env);
 }
 
+void Storage::clearEnv()
+{
+    for (auto env : Storage::Private::sEnvironments) {
+        mdb_env_close(env);
+    }
+    Storage::Private::sEnvironments.clear();
+}
+
 } // namespace Sink