From ff847aa329134d825c0f3db4395c74a311c3c63c Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 25 Oct 2017 11:52:43 +0200 Subject: [PATCH] Fix qml error when there is no connected printer Also fixes code style --- plugins/UM3NetworkPrinting/UM3InfoComponents.qml | 16 +++++++++++----- resources/qml/Menus/MaterialMenu.qml | 16 +++++++++++----- resources/qml/Menus/NozzleMenu.qml | 16 +++++++++++----- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/plugins/UM3NetworkPrinting/UM3InfoComponents.qml b/plugins/UM3NetworkPrinting/UM3InfoComponents.qml index 87b8b219b7..d0c95e1524 100644 --- a/plugins/UM3NetworkPrinting/UM3InfoComponents.qml +++ b/plugins/UM3NetworkPrinting/UM3InfoComponents.qml @@ -119,11 +119,17 @@ Item onClicked: manager.loadConfigurationFromPrinter() function isClusterPrinter() { - var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize - // This is a non cluster printer or the cluster it is just one printer - if (typeof clusterSize == "undefined" || clusterSize == 1) - return false - return true + if(Cura.MachineManager.printerOutputDevices.length == 0) + { + return false; + } + var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize; + // This is not a cluster printer or the cluster it is just one printer + if(clusterSize == undefined || clusterSize == 1) + { + return false; + } + return true; } } } diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 5422457140..d3ecfb69fe 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -16,11 +16,17 @@ Menu property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool isClusterPrinter: { - var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize - // This is a non cluster printer or the cluster it is just one printer - if (typeof clusterSize == "undefined" || clusterSize == 1) - return false - return true + if(Cura.MachineManager.printerOutputDevices.length == 0) + { + return false; + } + var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize; + // This is not a cluster printer or the cluster it is just one printer + if(clusterSize == undefined || clusterSize == 1) + { + return false; + } + return true; } UM.SettingPropertyProvider diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml index 79bc105b58..e9f2df1f38 100644 --- a/resources/qml/Menus/NozzleMenu.qml +++ b/resources/qml/Menus/NozzleMenu.qml @@ -16,11 +16,17 @@ Menu property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool isClusterPrinter: { - var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize - // This is a non cluster printer or the cluster it is just one printer - if (typeof clusterSize == "undefined" || clusterSize == 1) - return false - return true + if(Cura.MachineManager.printerOutputDevices.length == 0) + { + return false; + } + var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize; + // This is not a cluster printer or the cluster it is just one printer + if(clusterSize == undefined || clusterSize == 1) + { + return false; + } + return true; } MenuItem