From fdcce1780e0dee817cc766f9f01746d078fc7925 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 8 Nov 2017 19:24:09 +0100 Subject: [PATCH 1/2] Also check if base.selectedPrinter is null --- plugins/UM3NetworkPrinting/DiscoverUM3Action.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml index eb1bf786b0..65d33369aa 100644 --- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml @@ -276,12 +276,12 @@ Cura.MachineAction width: parent.width wrapMode: Text.WordWrap text:{ - if (base.selectedPrinter == undefined) + if (base.selectedPrinter == undefined || base.selectedPrinter == null) { return ""; } // The property cluster size does not exist for older UM3 devices. - if(base.selectedPrinter != undefined && base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1) + if(base.selectedPrinter != undefined && (base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1)) { return ""; } From 1468c3aae5259a850fcea9dbc6d2c597c6e72006 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 9 Nov 2017 07:37:09 +0100 Subject: [PATCH 2/2] move undefined/null check --- plugins/UM3NetworkPrinting/DiscoverUM3Action.qml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml index 65d33369aa..e4cbc6a0c7 100644 --- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml @@ -276,12 +276,8 @@ Cura.MachineAction width: parent.width wrapMode: Text.WordWrap text:{ - if (base.selectedPrinter == undefined || base.selectedPrinter == null) - { - return ""; - } // The property cluster size does not exist for older UM3 devices. - if(base.selectedPrinter != undefined && (base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1)) + if(!base.selectedPrinter && (base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1)) { return ""; }