From d64eff9947a4a9a116cb302af59e61fe632d28a9 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Tue, 26 Jul 2016 18:54:55 +0200
Subject: [PATCH] Fix updating the Per Object Settings color swatch

CURA-1971
---
 plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index 79f10f508f..dc0574d14d 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -47,7 +47,9 @@ Item {
                     id: extruders_model
                     onRowsInserted: extruderSelector.visible = extruders_model.rowCount() > 1
                     onModelReset:   extruderSelector.visible = extruders_model.rowCount() > 1
+                    onModelChanged: extruderSelector.color = extruders_model.getItem(extruderSelector.currentIndex).colour
                 }
+                property string color: extruders_model.getItem(extruderSelector.currentIndex).colour
                 visible: extruders_model.rowCount() > 1
                 textRole: "name"
                 width: UM.Theme.getSize("setting_control").width
@@ -88,7 +90,7 @@ Item {
                             anchors.leftMargin: UM.Theme.getSize("default_lining").width
                             anchors.verticalCenter: parent.verticalCenter
 
-                            color: extruders_model.getItem(extruderSelector.currentIndex).colour
+                            color: extruderSelector.color
                             border.width: UM.Theme.getSize("default_lining").width
                             border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : UM.Theme.getColor("setting_control_border")
                         }
@@ -136,6 +138,7 @@ Item {
                         if(extruders_model.getItem(i).id == UM.ActiveTool.properties.getValue("SelectedActiveExtruder"))
                         {
                             extruderSelector.currentIndex = i;
+                            extruderSelector.color = extruders_model.getItem(i).colour;
                             return;
                         }
                     }