diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-11-04 21:20:09 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-11-04 21:20:09 +0300 |
| commit | 34e0cd7395143c5ff455f173a6659e522f90a150 (patch) | |
| tree | 9e785e7d6c6d4619c9dfa69324573f9b024d8431 /src/Display | |
| parent | 635d0c8f68bf0e59b6f28084618ea3ee26edf704 (diff) | |
Fixed issues with incorrect reporting of pausing/resuming states
Also made is quicker to establish whether pausing or resuming
Diffstat (limited to 'src/Display')
| -rw-r--r-- | src/Display/MenuItem.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Display/MenuItem.cpp b/src/Display/MenuItem.cpp index bfc9b9e2..a43bac4f 100644 --- a/src/Display/MenuItem.cpp +++ b/src/Display/MenuItem.cpp @@ -84,8 +84,11 @@ bool MenuItem::IsVisible() const noexcept case 3: return !reprap.GetGCodes().IsReallyPrinting(); case 4: return reprap.GetPrintMonitor().IsPrinting(); case 5: return !reprap.GetPrintMonitor().IsPrinting(); - case 6: return reprap.GetGCodes().IsPaused() || reprap.GetGCodes().IsPausing(); - case 7: return reprap.GetGCodes().IsReallyPrinting() || reprap.GetGCodes().IsResuming(); + case 6: { + const PauseState ps = reprap.GetGCodes().GetPauseState(); + return ps == PauseState::pausing || ps == PauseState::paused; + } + case 7: return reprap.GetGCodes().IsReallyPrintingOrResuming(); case 10: return MassStorage::IsDriveMounted(0); case 11: return !MassStorage::IsDriveMounted(0); case 20: |