From 6f33c4410c090166112909bd4e38290066a5ff43 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 17 Oct 2018 14:39:42 +0200 Subject: [PATCH] Review tweaks Contributes to CL-897 and CL-1051 --- .../resources/qml/ConfigurationChangeBlock.qml | 2 +- plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/ConfigurationChangeBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/ConfigurationChangeBlock.qml index 63815b58bf..3d55ee40e2 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/ConfigurationChangeBlock.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/ConfigurationChangeBlock.qml @@ -185,7 +185,7 @@ Item { } text: catalog.i18nc("@label", "Override"); visible: { - if (root.job & root.job.configurationChanges) { + if (root.job && root.job.configurationChanges) { var length = root.job.configurationChanges.length; for (var i = 0; i < length; i++) { var typeOfChange = root.job.configurationChanges[i].typeOfChange; diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml index 61009a0ec3..fa4fada0bb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml @@ -233,7 +233,7 @@ Item { // Progress bar PrinterCardProgressBar { - visible: printer && printer.activePrintJob != null && printer.activePrintJob != undefined; + visible: printer && printer.activePrintJob != null; } } }