Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -re28183bddebf7383c1bd113e7b8ef4ea11f494fb
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision e28183bddebf7383c1bd113e7b8ef4ea11f494fb)
@@ -41,6 +41,17 @@
     readonly property string heatTitle      : qsTr("Heat Disinfect")
     readonly property string chemicalTitle  : qsTr("Chemical Disinfect")
 
+    function doSettingsDisinfect( vFlush, vHeat, vIsChemical ) {
+        // since we do't know the order or timing of the FW message
+        // prefered to set the screens by UI.
+        // If HDOpMode says/has the same state nothing changes, but at least UI is not showing empty screen.
+        _mainMenu.hidden = true
+        stackView.clear()
+        if ( vFlush      ) { page( _disinfectFlush               ); return }
+        if ( vHeat       ) { page( _disinfectHeat                ); return }
+        if ( vIsChemical ) { page( _disinfectChemicalInstruction ); return }
+    }
+
     DisinfectBase { id          :  _disinfect
         objectName              : "_disinfect"
         property int stackStepIndex : 0
@@ -63,6 +74,17 @@
         instructionBased        : true
     }
 
+    DisinfectBase { id          :  _disinfectFlush
+        objectName              : "_disinfectFlush"
+        header.stepNames        : [ _root.disinfectTitle ,  _root.flushTitle ]
+        title.text              :                           _root.flushTitle
+        hasTimeCircle           : true
+        timeCircleMinimum       : 0
+        timeCircleMaximum       : vDisinfectDGData.flushTimeTotal
+        timeCircleProgressValue : vDisinfectDGData.flushTimeElapsed
+        timeCircleTimeTextValue : vDisinfectDGData.flushTimeRemaining * 60
+    }
+
     DisinfectBase { id          :  _disinfectHeat
         objectName              : "_disinfectHeat"
         header.stepNames        : [ _root.disinfectTitle ,  _root.heatTitle ]
@@ -112,17 +134,6 @@
         ]
     }
 
-    DisinfectBase { id  :  _flush
-        objectName      : "_flush"
-        header.stepNames        : [ _root.disinfectTitle ,  _root.flushTitle ]
-        title.text              :                           _root.flushTitle
-        hasTimeCircle           : true
-        timeCircleMinimum       : 0
-        timeCircleMaximum       : vDisinfectDGData.flushTimeTotal
-        timeCircleProgressValue : vDisinfectDGData.flushTimeElapsed
-        timeCircleTimeTextValue : vDisinfectDGData.flushTimeRemaining * 60
-    }
-
     // ----- Checkmarks
     Connections { target: vDisinfectStates
         onStartEntered                      : {}
@@ -164,7 +175,7 @@
 
     Connections { target: vHDOperationMode
         onStandbyWaitDisinfectChanged       : { page( _disinfect                 , vstandbyWaitDisinfect        )} // initialItem
-        onStandbyDGFlushChanged             : { page( _flush                     , vstandbyDGFlush              )}
+        onStandbyDGFlushChanged             : { page( _disinfectFlush            , vstandbyDGFlush              )}
         onStandbyDGDisinfectHeatChanged     : { page( _disinfectHeat             , vstandbyDGDisinfectHeat      )}
         onStandbyDGDisinfectChemicalChanged : { page( _disinfectChemicalProgress , vstandbyDGDisinfectChemical  )}
     }