Index: sources/view/hd/data/VHDOperationModeData.h
===================================================================
diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -rc71946746586d5a4061ad866ce7dbbaf74b9798a
--- sources/view/hd/data/VHDOperationModeData.h	(.../VHDOperationModeData.h)	(revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db)
+++ sources/view/hd/data/VHDOperationModeData.h	(.../VHDOperationModeData.h)	(revision c71946746586d5a4061ad866ce7dbbaf74b9798a)
@@ -51,12 +51,13 @@
     PROPERTY( bool    , postTreatment               , false ) ///< Post-Treatment mode
     PROPERTY( bool    , invalidMode                 , false ) ///< Not legal - an illegal mode transition occurred
 
-    PROPERTY( bool    , standbyStart                , false ) ///< Start standby                                     , STANDBY_START_STATE = 0
-    PROPERTY( bool    , standbyWaitTreatment        , false ) ///< Wait for treatment                                , STANDBY_WAIT_FOR_TREATMENT_STATE
-    PROPERTY( bool    , standbyWaitDisinfect        , false ) ///< Wait for disinfect                                , STANDBY_WAIT_FOR_DISINFECT_STATE
-    PROPERTY( bool    , standbyDGFlush              , false ) ///< DG flush operation is in progress                 , STANDBY_DG_FLUSH_IN_PROGRESS_STATE
-    PROPERTY( bool    , standbyDGDisinfectHeat      , false ) ///< DG heat disinfection operation is in progress     , STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE
-    PROPERTY( bool    , standbyDGDisinfectChemical  , false ) ///< DG chemical disinfection operation is in progress , STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE
+    // these are triggers but shall only be triggered when in standby mode.
+    TRIGGER ( bool    , standbyStart                , false ) ///< Start standby                                     , STANDBY_START_STATE = 0
+    TRIGGER ( bool    , standbyWaitTreatment        , false ) ///< Wait for treatment                                , STANDBY_WAIT_FOR_TREATMENT_STATE
+    TRIGGER ( bool    , standbyWaitDisinfect        , false ) ///< Wait for disinfect                                , STANDBY_WAIT_FOR_DISINFECT_STATE
+    TRIGGER ( bool    , standbyDGFlush              , false ) ///< DG flush operation is in progress                 , STANDBY_DG_FLUSH_IN_PROGRESS_STATE
+    TRIGGER ( bool    , standbyDGDisinfectHeat      , false ) ///< DG heat disinfection operation is in progress     , STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE
+    TRIGGER ( bool    , standbyDGDisinfectChemical  , false ) ///< DG chemical disinfection operation is in progress , STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE
 
     Q_PROPERTY(QString text READ text NOTIFY opModeChanged)