Index: NVDataMgmt.c
===================================================================
diff -u -rb46d288230d4e6aa32a7a2764c3d392c4dce0121 -r3db303d846dff172a31f2a5178e7aa5d8ee8ef24
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision b46d288230d4e6aa32a7a2764c3d392c4dce0121)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 3db303d846dff172a31f2a5178e7aa5d8ee8ef24)
@@ -1111,7 +1111,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR, recordCRC, calcCRC );
     }
     // Check the CRC for last disinfection date
-    calcCRC = crc16 ( (U08*)&lastDisinfectionRecord.disinfectionDate, sizeof(MAX_DATE_CHARACTERS) );
+    calcCRC = crc16 ( (U08*)&lastDisinfectionRecord.date.disinfectionDate, sizeof(DISINFECTION_DATE_T) );
     recordCRC = lastDisinfectionRecord.crc;
     if ( calcCRC != recordCRC )
     {
@@ -1205,7 +1205,7 @@
         memcpy (date.disinfectionDate, a, sizeof(DISINFECTION_DATE_T));
         setDisinfectionDate (date);
 
-        //writeLogData ( &logData );
+        writeLogData ( &logData );
         //readLogData ( &mytest, sizeof(readBufferForTest) );
         //readLogData ( &mytest, sizeof(readBufferForTest) );
 
@@ -1641,14 +1641,13 @@
 
     _disable_IRQ();
     tempIndex = queueFrontIndex;
-    if ( FALSE == isQueueFull() )
+    if ( !isQueueEmpty() )
     {
         queueFrontIndex = INC_WRAP( queueFrontIndex, 0, QUEUE_MAX_SIZE - 1 );
+        currentJob = jobQueue [ tempIndex ];
     }
     _enable_IRQ();
 
-    currentJob = jobQueue [ tempIndex ];
-
     if ( queueCount > 0 )
     {
         queueCount--;