From 3d92bd0133138dce85b8668f9f3bf7b30d6b9550 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 24 Jan 2019 14:46:00 +0100 Subject: [PATCH] Prevent endless skeleton loading on Cloud Contributes to CL-1154 For you @christerbeke --- .../resources/qml/MonitorQueue.qml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index c9996849fb..76bd3b4fe6 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -160,7 +160,17 @@ Item } printJob: modelData } - model: OutputDevice.receivedPrintJobs ? OutputDevice.queuedPrintJobs : [null,null] + model: + { + // When printing over the cloud we don't recieve print jobs until there is one, so + // unless there's at least one print job we'll be stuck with skeleton loading + // indefinitely. + if (Cura.MachineManager.activeMachineHasActiveCloudConnection) + { + return OutputDevice.queuedPrintJobs + } + return OutputDevice.receivedPrintJobs ? OutputDevice.queuedPrintJobs : [null,null] + } spacing: 6 // TODO: Theme! } }