Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -ra04fd119778f0483cba5139a11e3c6bad7f2324a -r627b97843f87f5ca8fbd731c6c4a6d9fae4352ce
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision a04fd119778f0483cba5139a11e3c6bad7f2324a)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 627b97843f87f5ca8fbd731c6c4a6d9fae4352ce)
@@ -802,9 +802,9 @@
     bool mNeedsAcknow = needsAcknow(vActionId);
     if (mNeedsAcknow) {
         mSequence = -mSequence;
-        #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG
-        LOG_EVENT(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId)));
-        #endif
+        if ( ! gDisableAcknowLog ) {
+            LOG_EVENT(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId)));
+        }
 #ifdef DEBUG_ACKBACK_HD_TO_UI
                 qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckReq : %1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence);
 #endif
@@ -876,9 +876,9 @@
     bool ok = false;
     if ( mActionId == GuiActionType::ID_Acknow ) {
         ok = true;
-        #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG
+        if ( ! gDisableAcknowLog ) {
             LOG_EVENT(tr("%1,Ack Bak, Sq:%2").arg(vSrcText).arg(mSequence));
-        #endif
+        }
         #ifdef DEBUG_ACKBACK_HD_TO_UI
             qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId);
         #endif
@@ -905,19 +905,19 @@
 
     if (mSequence < 0) {
         ok = true;
-        #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG
+        if ( ! gDisableAcknowLog ) {
             LOG_EVENT(tr("%1,Ack Req, Sq:%2, ID:%3").arg(vSrcText).arg(mSequence).arg(Format::toHexString(mActionId)));
-        #endif
+        }
         #ifdef DEBUG_ACKBACK_HD_TO_UI
             qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckReq : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId);
         #endif
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak is immediately handled at the same place.
         QString dstText;
         Can_Id dstID = MessageInterpreter::identifyDestination(vMessage.can_id, &dstText);
         actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence, dstID);
-        #ifndef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG
+        if ( ! gDisableAcknowLog ) {
             LOG_EVENT(tr("UI,Ack Bak, Sq:%1, Dst:%2").arg(-mSequence).arg(dstText));
-        #endif
+        }
         #ifdef DEBUG_ACKBACK_HD_TO_UI
             qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(-mSequence).arg(vMessage.actionId);
         #endif