Index: sources/cloudsync/CloudSyncController.cpp
===================================================================
diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -rfec49d1a8016d25cedff4cf2fefb4c4cd1c7c259
--- sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision 54c4136d95375116e6daf23b7d4179159cf13d0c)
+++ sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision fec49d1a8016d25cedff4cf2fefb4c4cd1c7c259)
@@ -20,12 +20,15 @@
 // Project
 #include "MainTimer.h"
 #include "MessageDispatcher.h"
+#include "ApplicationController.h"
 #include "GuiController.h"
 #include "DeviceController.h"
 #include "FileHandler.h"
 #include "crc.h"
 #include "TreatmentLog.h"
 
+SINGLETON_DISABLE(CloudSyncController)
+
 /*!
  * \brief   CloudSyncController::CloudSyncController
  * \details Constructor
@@ -86,6 +89,10 @@
  */
 void CloudSyncController::initConnections()
 {
+    if ( ! gDisableCloudSyncFailStop ) {
+        SINGLETON_DISABLE_CONNECT(didPOSTCloudSync)
+    }
+
     connect(&_DeviceController  , SIGNAL(didWatchFileChange (const QString &)),
             this                ,   SLOT( onWatchFileChange (const QString &)));
     connect(&_MessageDispatcher , SIGNAL(didActionReceive   (GuiActionType  , const QVariantList &)),
@@ -472,7 +479,7 @@
 
     // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     // writing the message into the buffer.
-    LOG_EVENT( "CS," + vInpBuff );
+    LOG_EVENT_UI( vInpBuff );
     if ( ! Storage::FileHandler::write(_date_inp_File, vInpBuff + "\n") ) { error = eError_LogFileInp; args = { _date_inp_File }; ok = false; goto lErr; }
     return ok;
 
@@ -522,7 +529,7 @@
 
     data = Format::fromVariantList(vData);
 
-    if ( isDuplicate(messageID, data)   ) { error = eError_Duplicate; args = { messageID }; ok = false; return ok; } // goto lErr; } don't log it just ignore and return false.
+    if ( isDuplicate(messageID, data)   ) { error = eError_Duplicate; args = { messageID }; ok = false; return ok; } // TODO: goto lErr; } don't log it just ignore and return false.
 
     // store the last message data
     _uiHistory[messageID] = data;