From 2ce567ccfe094311842deeca51c26b92d4481ef0 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Tue, 30 Jul 2019 15:16:47 +0200
Subject: [PATCH] Fix material current item reset

CURA-6679
---
 resources/qml/Preferences/Materials/MaterialsList.qml | 1 +
 resources/qml/Preferences/Materials/MaterialsPage.qml | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/resources/qml/Preferences/Materials/MaterialsList.qml b/resources/qml/Preferences/Materials/MaterialsList.qml
index fa7c4b86cb..96f6730029 100644
--- a/resources/qml/Preferences/Materials/MaterialsList.qml
+++ b/resources/qml/Preferences/Materials/MaterialsList.qml
@@ -102,6 +102,7 @@ Item
                 }
             }
         }
+        base.currentItem = null
         return false
     }
 
diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml
index 0760bbfb57..a0ce3c4b49 100644
--- a/resources/qml/Preferences/Materials/MaterialsPage.qml
+++ b/resources/qml/Preferences/Materials/MaterialsPage.qml
@@ -58,6 +58,11 @@ Item
     {
         forceActiveFocus()
         materialDetailsPanel.currentItem = currentItem
+        // CURA-6679 If the current item is gone after the model update, reset the current item to the active material.
+        if (currentItem == null)
+        {
+            resetExpandedActiveMaterial()
+        }
     }
 
     // Main layout