From 6e171be0b93e7132b191cd86e85757b3f5273988 Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Tue, 28 Nov 2017 13:08:25 +0100
Subject: [PATCH 1/2] After changing the settings refresh simulation max path
 number CURA-4632

---
 plugins/SimulationView/SimulationView.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py
index b7bff91f9b..44f472129f 100644
--- a/plugins/SimulationView/SimulationView.py
+++ b/plugins/SimulationView/SimulationView.py
@@ -154,6 +154,7 @@ class SimulationView(View):
     def _onSceneChanged(self, node):
         self.setActivity(False)
         self.calculateMaxLayers()
+        self.calculateMaxPathsOnLayer(self._current_layer_num)
 
     def isBusy(self):
         return self._busy

From fa1d1ee3ad105390ab7a631228d3151c8f0252df Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Tue, 28 Nov 2017 14:35:42 +0100
Subject: [PATCH 2/2] Fix layer height slider auto switching

CURA-4617
---
 resources/qml/SidebarSimple.qml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index 020b75e3ce..e923963355 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -303,7 +303,7 @@ Item
                             // only change if an active machine is set and the slider is visible at all.
                             if (Cura.MachineManager.activeMachine != null && visible) {
                                 // prevent updating during view initializing. Trigger only if the value changed by user
-                                if (qualitySlider.value != qualityModel.qualitySliderActiveIndex) {
+                                if (qualitySlider.value != qualityModel.qualitySliderActiveIndex && qualityModel.qualitySliderActiveIndex != -1) {
                                     // start updating with short delay
                                     qualitySliderChangeTimer.start()
                                 }
@@ -368,7 +368,7 @@ Item
                 {
                     id: customisedSettings
 
-                    visible: Cura.SimpleModeSettingsManager.isProfileCustomized
+                    visible: Cura.SimpleModeSettingsManager.isProfileCustomized || Cura.SimpleModeSettingsManager.isProfileUserCreated
                     height: speedSlider.height * 0.8
                     width: speedSlider.height * 0.8
 
@@ -381,7 +381,18 @@ Item
 
                     onClicked:
                     {
-                        discardOrKeepProfileChangesDialog.show()
+                        // if the current profile is user-created, switch to a built-in quality
+                        if (Cura.SimpleModeSettingsManager.isProfileUserCreated)
+                        {
+                            if (Cura.ProfilesModel.rowCount() > 0)
+                            {
+                                Cura.MachineManager.setActiveQuality(Cura.ProfilesModel.getItem(0).id)
+                            }
+                        }
+                        if (Cura.SimpleModeSettingsManager.isProfileCustomized)
+                        {
+                            discardOrKeepProfileChangesDialog.show()
+                        }
                     }
                     onEntered:
                     {