From 473160a102c902bd4161d3b7d4027414a71c144a Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Thu, 13 Dec 2018 17:02:13 +0100
Subject: [PATCH 1/3] Add a check for null to avoid warnings in the logs.

---
 resources/qml/MainWindow/MainWindowHeader.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index 793df42da0..8f6957d9cd 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -54,7 +54,7 @@ Item
             {
                 text: model.name.toUpperCase()
                 checkable: true
-                checked: model.id == UM.Controller.activeStage.stageId
+                checked: UM.Controller.activeStage != null ? model.id == UM.Controller.activeStage.stageId : false
 
                 anchors.verticalCenter: parent.verticalCenter
                 exclusiveGroup: mainWindowHeaderMenuGroup

From 856c1dcb20d42a624bfc367ca135042d7404953f Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 13 Dec 2018 17:21:07 +0100
Subject: [PATCH 2/3] Also disconnect the signal for the old parent of
 printSetupSelector

---
 resources/qml/Cura.qml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index cf6f36a492..ff5a603fda 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -278,29 +278,33 @@ UM.MainWindow
                 height: UM.Theme.getSize("stage_menu").height
                 source: UM.Controller.activeStage != null ? UM.Controller.activeStage.stageMenuComponent : ""
 
-
                 //  HACK: This is to ensure that the parent never gets set to null, as this wreaks havoc on the focus.
                 function onParentDestroyed()
                 {
                     printSetupSelector.parent = stageMenu
                     printSetupSelector.visible = false
                 }
+                property item oldParent: null
 
                 // The printSetupSelector is defined here so that the setting list doesn't need to get re-instantiated
                 // Every time the stage is changed.
                 property var printSetupSelector: Cura.PrintSetupSelector
                 {
-                    width: UM.Theme.getSize("print_setup_widget").width
-                    height: UM.Theme.getSize("stage_menu").height
-                    headerCornerSide: RoundedRectangle.Direction.Right
-                    onParentChanged:
-                    {
-                        visible = parent != stageMenu
-                        parent.Component.destruction.connect(stageMenu.onParentDestroyed)
-                    }
+                   width: UM.Theme.getSize("print_setup_widget").width
+                   height: UM.Theme.getSize("stage_menu").height
+                   headerCornerSide: RoundedRectangle.Direction.Right
+                   onParentChanged:
+                   {
+                       if(stageMenu.oldParent !=null)
+                       {
+                           stageMenu.oldParent.Component.destruction.disconnect(stageMenu.onParentDestroyed)
+                       }
+                       stageMenu.oldParent = parent
+                       visible = parent != stageMenu
+                       parent.Component.destruction.connect(stageMenu.onParentDestroyed)
+                   }
                 }
             }
-
             UM.MessageStack
             {
                 anchors

From 8dc2a41fb7af876a2f4c041fd68482f131b4385c Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Thu, 13 Dec 2018 17:27:16 +0100
Subject: [PATCH 3/3] Typo, wrong item type, "item" CURA-5941

---
 resources/qml/Cura.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index ff5a603fda..2b6f989e0b 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -284,7 +284,7 @@ UM.MainWindow
                     printSetupSelector.parent = stageMenu
                     printSetupSelector.visible = false
                 }
-                property item oldParent: null
+                property Item oldParent: null
 
                 // The printSetupSelector is defined here so that the setting list doesn't need to get re-instantiated
                 // Every time the stage is changed.