Index: sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentRecirculate.qml
===================================================================
diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -rf4bdf1e57221c8395580fc169d239d49d670ce1b
--- sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentRecirculate.qml	(.../PostTreatmentRecirculate.qml)	(revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639)
+++ sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentRecirculate.qml	(.../PostTreatmentRecirculate.qml)	(revision f4bdf1e57221c8395580fc169d239d49d670ce1b)
@@ -100,7 +100,7 @@
         }
 
         TouchRect { id : _endTreatmentTouchRect
-            visible         : true
+            visible         : vTreatmentTime.time_Total > 0
             text.text       : qsTr("END TREATMENT")
             width           : _buttonGroup.buttonsWidth
             onClicked       : treatmentEndClicked()
Index: sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml
===================================================================
diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -rf4bdf1e57221c8395580fc169d239d49d670ce1b
--- sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml	(.../PostTreatmentRinsebackComplete.qml)	(revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639)
+++ sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml	(.../PostTreatmentRinsebackComplete.qml)	(revision f4bdf1e57221c8395580fc169d239d49d670ce1b)
@@ -145,7 +145,7 @@
         }
 
         TouchRect { id : _endTreatmentTouchRect
-            visible         : true // TODO: true if only treatment is not already complete
+            visible         : vTreatmentTime.time_Total > 0
             text.text       : qsTr("END TREATMENT")
             width           : _buttonGroup.buttonsWidth
             onClicked       : treatmentEndClicked()
Index: sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackInit.qml
===================================================================
diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -rf4bdf1e57221c8395580fc169d239d49d670ce1b
--- sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackInit.qml	(.../PostTreatmentRinsebackInit.qml)	(revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639)
+++ sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackInit.qml	(.../PostTreatmentRinsebackInit.qml)	(revision f4bdf1e57221c8395580fc169d239d49d670ce1b)
@@ -145,7 +145,7 @@
         }
 
         TouchRect { id : _endTreatmentTouchRect
-            visible         : true // true if only treatment is not already complete
+            visible         : vTreatmentTime.time_Total > 0
             text.text       : qsTr("END TREATMENT")
             width           : _buttonGroup.buttonsWidth
             onClicked       : treatmentEndClicked()