1 files changed, 7 insertions, 0 deletions

diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index b9a007d..ce77bbb 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -8,6 +8,7 @@
 #include <QReadWriteLock>
 #include <QString>
 #include <QTime>
+#include <QMutex>
 
 #include <lmdb.h>
 
@@ -26,8 +27,11 @@ public:
     AccessMode mode;
     bool readTransaction;
     bool firstOpen;
+    static QMutex sMutex;
 };
 
+QMutex Storage::Private::sMutex;
+
 Storage::Private::Private(const QString &s, const QString &n, AccessMode m)
     : storageRoot(s),
       name(n),
@@ -41,6 +45,9 @@ Storage::Private::Private(const QString &s, const QString &n, AccessMode m)
     dir.mkdir(storageRoot);
     dir.mkdir(fullPath);
 
+    //This seems to resolve threading related issues, not sure why though
+    QMutexLocker locker(&sMutex);
+
     //create file
     if (mdb_env_create(&env)) {
         // TODO: handle error