From 4aa95ab31746bf7e007670aa0c9a8212fcf4a74c Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 11 Jul 2016 14:54:08 +0200
Subject: [PATCH] Prevent showing custom profiles twice and fix separator in
 the profiles dropdown

CURA-1887
---
 resources/qml/Menus/ProfileMenu.qml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/resources/qml/Menus/ProfileMenu.qml b/resources/qml/Menus/ProfileMenu.qml
index 213f8c2629..68f83305d7 100644
--- a/resources/qml/Menus/ProfileMenu.qml
+++ b/resources/qml/Menus/ProfileMenu.qml
@@ -13,7 +13,10 @@ import Cura 1.0 as Cura
 
     Instantiator
     {
-        model: UM.InstanceContainersModel { filter: menu.getFilter({ "read_only": true }); }
+        model: UM.InstanceContainersModel
+        {
+            filter: menu.getFilter({ "read_only": true });
+        }
 
         MenuItem
         {
@@ -32,13 +35,11 @@ import Cura 1.0 as Cura
 
     Instantiator
     {
+        id: customProfileInstantiator
         model: UM.InstanceContainersModel
         {
-            id: customProfilesModel;
             filter: menu.getFilter({ "read_only": false });
-            onRowsInserted: customSeparator.visible = rowCount() > 1
-            onRowsRemoved: customSeparator.visible = rowCount() > 1
-            onModelReset: customSeparator.visible = rowCount() > 1
+            onModelReset: customSeparator.visible = rowCount() > 0
         }
 
         MenuItem
@@ -50,8 +51,16 @@ import Cura 1.0 as Cura
             onTriggered: Cura.MachineManager.setActiveQuality(model.id)
         }
 
-        onObjectAdded: menu.insertItem(index, object);
-        onObjectRemoved: menu.removeItem(object);
+        onObjectAdded:
+        {
+            customSeparator.visible = model.rowCount() > 0;
+            menu.insertItem(index, object);
+        }
+        onObjectRemoved:
+        {
+            customSeparator.visible = model.rowCount() > 0;
+            menu.removeItem(object);
+        }
     }
 
     ExclusiveGroup { id: group; }