From c3a373e2a2af77bb2183828b628bd0e5ea01d57a Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 3 May 2019 13:38:06 +0200
Subject: [PATCH] Remove usages of deprecated activeMachineName

---
 resources/qml/Dialogs/WorkspaceSummaryDialog.qml    | 13 ++++++++++++-
 .../qml/Preferences/Materials/MaterialsPage.qml     |  4 ++--
 resources/qml/PrinterSelector/MachineSelector.qml   |  6 +++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
index 47ee539ad0..b52a13e220 100644
--- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
+++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
@@ -123,7 +123,18 @@ UM.Dialog
                         }
                         Label
                         {
-                            text: Cura.MachineManager.activeMachineNetworkGroupName != "" ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
+                            text:
+                            {
+                                if(Cura.MachineManager.activeMachineNetworkGroupName != "")
+                                {
+                                    return Cura.MachineManager.activeMachineNetworkGroupName
+                                }
+                                if(Cura.MachineManager.activeMachine)
+                                {
+                                    return Cura.MachineManager.activeMachine.name
+                                }
+                                return ""
+                            }
                             width: Math.floor(scroll.width / 3) | 0
                         }
                     }
diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml
index 351a0bb541..2f126d8a1f 100644
--- a/resources/qml/Preferences/Materials/MaterialsPage.qml
+++ b/resources/qml/Preferences/Materials/MaterialsPage.qml
@@ -200,13 +200,13 @@ Item
             visible: text != ""
             text:
             {
-                var caption = catalog.i18nc("@action:label", "Printer") + ": " + Cura.MachineManager.activeMachineName;
+                var caption = catalog.i18nc("@action:label", "Printer") + ": " + Cura.MachineManager.activeMachine.name;
                 if (Cura.MachineManager.hasVariants)
                 {
                     var activeVariantName = ""
                     if(Cura.MachineManager.activeStack != null)
                     {
-                        activeVariantName =  Cura.MachineManager.activeStack.variant.name
+                        activeVariantName = Cura.MachineManager.activeStack.variant.name
                     }
                     caption += ", " + Cura.MachineManager.activeDefinitionVariantsName + ": " + activeVariantName;
                 }
diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index 35e2564bbf..405b6e15b4 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -32,7 +32,11 @@ Cura.ExpandablePopup
             {
                 return Cura.MachineManager.activeMachineNetworkGroupName
             }
-            return Cura.MachineManager.activeMachineName
+            if(Cura.MachineManager.activeStack != null)
+            {
+                return Cura.MachineManager.activeStack.name
+            }
+            return ""
         }
         source:
         {