From a5ba68bae3502a21ced78a19ad35b1394292c034 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Wed, 6 Jul 2016 14:09:08 +0200
Subject: [PATCH] Ensure that the display matches with the backend active
 extruder data

---
 cura/ExtruderManager.py         | 4 ++++
 resources/qml/SidebarHeader.qml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cura/ExtruderManager.py b/cura/ExtruderManager.py
index 5d0ad612cf..16eaf7f8c4 100644
--- a/cura/ExtruderManager.py
+++ b/cura/ExtruderManager.py
@@ -66,6 +66,10 @@ class ExtruderManager(QObject):
         self._active_extruder_index = index
         self.activeExtruderChanged.emit()
 
+    @pyqtProperty(int, notify = activeExtruderChanged)
+    def activeExtruderIndex(self):
+        return self._active_extruder_index
+
     def getActiveExtruderStack(self):
         global_container_stack = UM.Application.getInstance().getGlobalContainerStack()
         if global_container_stack:
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index ac6c491262..82dba70b92 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -13,7 +13,7 @@ Column
     id: base;
 
     property int totalHeightHeader: childrenRect.height
-    property int currentExtruderIndex: -1;
+    property int currentExtruderIndex:ExtruderManager.activeExtruderIndex;
 
     spacing: UM.Theme.getSize("default_margin").height
 
@@ -118,7 +118,7 @@ Column
             {
                 base.currentExtruderIndex = -1;
                 forceActiveFocus()
-                ExtruderManager.setActiveExtruderIndex(0);
+                ExtruderManager.setActiveExtruderIndex(base.currentExtruderIndex);
             }
         }