From 13717d3ce6895f9ceb60c0fe61fb0e2937253261 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Fri, 7 Sep 2018 16:05:24 +0200 Subject: [PATCH] Monitor Tab - Fix -1h -1m bug Contributes to CL-1047 --- .../resources/qml/ClusterControlItem.qml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml index 529566a7eb..69db8843d1 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml @@ -668,7 +668,12 @@ Component case "queued": return catalog.i18nc("@label:status", "Action required") default: - OutputDevice.formatDuration(modelData.activePrintJob.timeTotal - modelData.activePrintJob.timeElapsed) + /* Sometimes total minus elapsed is less than 0. Use Math.max() to prevent + remaining time from ever being less than 0. Negative durations cause + strange behavior such as displaying "-1h -1m". */ + var activeJob = modelData.activePrintJob + var remaining = activeJob.timeTotal - activeJob.timeElapsed; + OutputDevice.formatDuration(Math.max(remaining, 0)) } }