diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2021-12-20 15:08:50 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2021-12-20 15:08:50 +0300 |
| commit | fd411512c68c4875d63700b508618c1d1bb7d692 (patch) | |
| tree | 34bb1f11107d6e151d958a5ff51e3077355f65df /plugins | |
| parent | 74ed3219ccfdb7ca7b51c0f53215e78761063a95 (diff) | |
| parent | 306db978d9edea2cd4eb3ca3ab1f65eaf586646f (diff) | |
Merge branch '4.13' of github.com:Ultimaker/Cura
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index f698bd948e..23bcc589b1 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -73,6 +73,12 @@ Item switch (printJob.state) { case "wait_cleanup": + // This hack was removed previously. Then we found out that we don't get back 'aborted_wait_cleanup' + // for the UM2+C it seems. Will communicate this to other teams, in the mean time, put this back. + if (printJob.timeTotal > printJob.timeElapsed) + { + return catalog.i18nc("@label:status", "Aborted"); + } return catalog.i18nc("@label:status", "Finished"); case "finished": return catalog.i18nc("@label:status", "Finished"); |