Merge branch '4.13' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2021-12-20 13:08:50 +01:00
commit fd411512c6
6 changed files with 66 additions and 105 deletions

View file

@ -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");