Index: sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml
===================================================================
diff -u -r9b48fb662409e1c2b3c6db67f51f1356a765d772 -rb110ee732fe1306669f71d9c17ed4714e1f03ee2
--- sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml	(.../WaterSampleDialog.qml)	(revision 9b48fb662409e1c2b3c6db67f51f1356a765d772)
+++ sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml	(.../WaterSampleDialog.qml)	(revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
@@ -40,8 +40,8 @@
         Dialysate
     }
 
-    WaterSamplePage             { id: _waterSample;         visible : vSettings.roWaterMode ? _menu.index === WaterSampleDialog.WaterSample : false ;   }
-    WaterSampleDialysatePage    { id: _dialysateChecks;     visible : vSettings.roWaterMode ? _menu.index === WaterSampleDialog.Dialysate   : true  ;   }
+    WaterSamplePage             { id: _waterSample;         visible : vRoWaterMode.status ? _menu.index === WaterSampleDialog.WaterSample : false ;   }
+    WaterSampleDialysatePage    { id: _dialysateChecks;     visible : vRoWaterMode.status ? _menu.index === WaterSampleDialog.Dialysate   : true  ;   }
 
     MainMenu { id: _menu
         anchors {
@@ -69,7 +69,7 @@
 
     CloseButton { id : _closeButton
 
-        visible:  vSettings.roWaterMode ? _waterSample.isPrimary : true
+        visible:  vRoWaterMode.status ? _waterSample.isPrimary : true
 
         onClicked : {
             _root.close()