diff --git a/source/shared_lib/sources/platform/common/simple_threads.cpp b/source/shared_lib/sources/platform/common/simple_threads.cpp
index 3408a9aa..62c0ad93 100644
--- a/source/shared_lib/sources/platform/common/simple_threads.cpp
+++ b/source/shared_lib/sources/platform/common/simple_threads.cpp
@@ -235,8 +235,8 @@ void LogFileThread::addLogEntry(SystemFlags::DebugType type, string logEntry) {
 bool LogFileThread::checkSaveCurrentLogBufferToDisk() {
     bool ret = false;
     if(difftime(time(NULL),lastSaveToDisk) >= 5 ||
-       //LogFileThread::getLogEntryBufferCount() >= 2000000) {
-    	LogFileThread::getLogEntryBufferCount() >= 10000) {
+       LogFileThread::getLogEntryBufferCount() >= 1000000) {
+    	//LogFileThread::getLogEntryBufferCount() >= 10000) {
         lastSaveToDisk = time(NULL);
         ret = true;
     }
@@ -258,7 +258,8 @@ void LogFileThread::execute() {
 
         try	{
             for(;this->getQuitStatus() == false;) {
-                if(checkSaveCurrentLogBufferToDisk() == true) {
+                while(this->getQuitStatus() == false &&
+                	  checkSaveCurrentLogBufferToDisk() == true) {
                     saveToDisk(false,false);
                 }
                 if(this->getQuitStatus() == false) {