From 1b3cb323344cd6c75ec160ca936a1aff379ad64f Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 13 Dec 2018 15:59:15 +0100
Subject: [PATCH] Fix the simulation view not being selected as default

CURA-6028
---
 resources/qml/ViewsSelector.qml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/resources/qml/ViewsSelector.qml b/resources/qml/ViewsSelector.qml
index 0e2598a0d8..d91412cad0 100644
--- a/resources/qml/ViewsSelector.qml
+++ b/resources/qml/ViewsSelector.qml
@@ -14,24 +14,31 @@ Cura.ExpandablePopup
     contentPadding: UM.Theme.getSize("default_lining").width
     contentAlignment: Cura.ExpandablePopup.ContentAlignment.AlignLeft
 
-    property var viewModel: UM.ViewModel { }
-
-    property var activeView:
+    property var viewModel: UM.ViewModel
     {
-        for (var i = 0; i < viewModel.count; i++)
+        onDataChanged: updateActiveView()
+    }
+
+
+    property var activeView: null
+
+    function updateActiveView()
+    {
+        for (var index in viewModel.items)
         {
-            if (viewModel.items[i].active)
+
+            if (viewModel.items[index].active)
             {
-                return viewModel.items[i]
+                activeView = viewModel.items[index]
+                return
             }
         }
-        return null
+        activeView = null
     }
 
     Component.onCompleted:
     {
-        // Nothing was active, so just return the first one (the list is sorted by priority, so the most
-        // important one should be returned)
+        updateActiveView()
         if (activeView == null)
         {
             UM.Controller.setActiveView(viewModel.getItem(0).id)