1 files changed, 17 insertions, 10 deletions
diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp
index 16d5146fc53..612cf55121b 100644
--- a/src/shared/Database/SqlDelayThread.cpp
+++ b/src/shared/Database/SqlDelayThread.cpp
@@ -22,8 +22,12 @@
 #include "Database/SqlOperations.h"
 #include "DatabaseEnv.h"
 
-SqlDelayThread::SqlDelayThread(Database* db) : m_dbEngine(db), m_running(true)
+SqlDelayThread::SqlDelayThread(Database* db, const char* infoString) :m_running(true)
 {
+
+  m_dbEngine = new DatabaseType;
+  ((DatabaseType*)m_dbEngine)->Initialize(infoString, false);
+
 }
 
 void SqlDelayThread::run()
@@ -35,15 +39,17 @@ void SqlDelayThread::run()
 
     while (m_running)
     {
-        // if the running state gets turned off while sleeping
-        // empty the queue before exiting
-        ZThread::Thread::sleep(10);
-        while (!m_sqlQueue.empty())
-        {
-            s = m_sqlQueue.next();
-            s->Execute(m_dbEngine);
-            delete s;
-        }
+      try
+	{
+	  s = m_sqlQueue.next();
+	}
+      catch(...)
+	{continue;}
+      if(!s)
+	continue;
+      s->Execute(m_dbEngine);
+      delete s;
+      
     }
 
     #ifndef DO_POSTGRESQL
@@ -54,5 +60,6 @@ void SqlDelayThread::run()
 void SqlDelayThread::Stop()
 {
     m_running = false;
+    m_sqlQueue.cancel();
 }