Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml
===================================================================
diff -u -r0975a67dd4e4673b9a7b226bfea02cbfa489c418 -r70d6ebddd11a5df068f059fd563a0c1d0b50a2a3
--- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml	(.../PreTreatmentInstallStack.qml)	(revision 70d6ebddd11a5df068f059fd563a0c1d0b50a2a3)
@@ -23,28 +23,28 @@
     }
 
     property int subStepIndex: PreTreatmentInstallStack.Step.BloodSetTubing
+    property int    stepIndex: PreTreatmentStack.Step.Installation
 
-    onVisibleChanged: {
-        if (visible) {
-            _headerBar.activeStack = stackView
-        }
-    }
-
     signal goToNextStep()
     signal goToPreviousStep()
 
-    function initStack() { page ( _preTreatmentBloodSetTubing ) }
+    function setPage(vPage, vCondition) {
+        _root.subStepIndex = vPage.stepIndex
+        page( vPage , vCondition)
+    }
 
+    function initStack() { setPage ( _preTreatmentBloodSetTubing ) }
+
     function continueClicked() {
         switch ( _root.subStepIndex ) {
         case PreTreatmentInstallStack.Step.BloodSetTubing:
             vPreTreatmentAdjustmentDisposablesConfirm.doConfirm()
             break
         case PreTreatmentInstallStack.Step.BloodLines:
-            page ( _preTreatmentPressureLinesAndDialyzer )
+            setPage ( _preTreatmentPressureLinesAndDialyzer )
             break
         case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer:
-            page ( _pretreatmentSalineSubstitution )
+            setPage ( _pretreatmentSalineSubstitution )
             break
         case PreTreatmentInstallStack.Step.SalineSubStitution:
             goToNextStep ()
@@ -60,13 +60,13 @@
             goToPreviousStep ()
             break
         case PreTreatmentInstallStack.Step.BloodLines:
-            page ( _preTreatmentBloodSetTubing )
+            setPage ( _preTreatmentBloodSetTubing )
             break
         case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer:
-            page ( _preTreatmentBloodLines )
+            setPage ( _preTreatmentBloodLines )
             break
         case PreTreatmentInstallStack.Step.SalineSubStitution:
-            page ( _preTreatmentPressureLinesAndDialyzer )
+            setPage ( _preTreatmentPressureLinesAndDialyzer )
             break
         default:
             break
@@ -88,41 +88,31 @@
     }
 
     // ----- Screens definitions
-    PreTreatmentBase { id: _preTreatmentBloodSetTubing
-        instructionBased    : true
-        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodSetTubing; updateModel()           }
-        subStepName         : qsTr("Blood Tubing Set")
+    PreTreatmentBase { id: _preTreatmentBloodSetTubing;             stepIndex: PreTreatmentInstallStack.Step.BloodSetTubing;            subStepName: qsTr("Blood Tubing Set");              instructionBased: true  }
+    PreTreatmentBase { id: _preTreatmentBloodLines;                 stepIndex: PreTreatmentInstallStack.Step.BloodLines;                subStepName: qsTr("Bloodlines");                    instructionBased: true  }
+    PreTreatmentBase { id: _preTreatmentPressureLinesAndDialyzer;   stepIndex: PreTreatmentInstallStack.Step.PressureLinesAndDialyzer;  subStepName: qsTr("Pressure Lines and Dialyzer");   instructionBased: true  }
+    PreTreatmentBase { id: _pretreatmentSalineSubstitution;         stepIndex: PreTreatmentInstallStack.Step.SalineSubStitution;                                                            instructionBased: true
+                        subStepName: vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF ? qsTr("Substitution") :
+                                                                                                 qsTr("Saline")
     }
 
-    PreTreatmentBase { id: _preTreatmentBloodLines
-        instructionBased        : true
-        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodLines ;    updateModel()           }
-        subStepName         : qsTr("Bloodlines")
-    }
-
-    PreTreatmentBase { id: _preTreatmentPressureLinesAndDialyzer
-        instructionBased        :  true
-        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.PressureLinesAndDialyzer; updateModel() }
-        subStepName         : qsTr("Pressure Lines and Dialyzer")
-    }
-
-    PreTreatmentBase { id: _pretreatmentSalineSubstitution
-        instructionBased    : true
-        onVisibleChanged    : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.SalineSubStitution;         updateModel()           }
-        subStepName         : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF ?   qsTr("Substitution") :
-                                                                                            qsTr("Saline")
-    }
-
     // blood tubing set auto-load
     Connections { target: vPreTreatmentAdjustmentDisposablesConfirm
         function onAdjustmentTriggered              ( vValue ) {
             if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) {
                 _preTreatmentBloodSetTubing.reasonText     = ""
                 if ( vSettings.advancedMode )   { goToNextStep ()                   }
-                else                            { page ( _preTreatmentBloodLines )  }
+                else                            { setPage ( _preTreatmentBloodLines )  }
             } else {
                  _preTreatmentBloodSetTubing.reasonText    = vPreTreatmentAdjustmentDisposablesConfirm.text()
             }
         }
     }
+
+    onVisibleChanged: {
+        if (visible) {
+            _headerBar.activeStack = stackView
+            initStack()
+        }
+    }
 }