diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-04-16 22:11:32 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-04-16 22:11:32 +0300 |
| commit | bf54e89e2d2732cbb74d0920a78746805defac4c (patch) | |
| tree | d4b8f7ed8840a41cf0c0d72bf37eef1d5a5c9aa4 /src/Display | |
| parent | a655329f8b265a564d272c0f298f80e2ec88c6a9 (diff) | |
Bug fixes
Fixed missing error message when probe is already triggered at the start
of a G29 or G30 probing move and there is a retractprobe.g file
Fixed incorrect filament consumption progress when wipe-while-retracting
is used in the slicer
Fixed spurios display of heater fault message on 12864 display when
there are no tools
Diffstat (limited to 'src/Display')
| -rw-r--r-- | src/Display/MenuItem.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Display/MenuItem.cpp b/src/Display/MenuItem.cpp index 6daf8bd4..0fc25b9e 100644 --- a/src/Display/MenuItem.cpp +++ b/src/Display/MenuItem.cpp @@ -88,7 +88,10 @@ bool MenuItem::IsVisible() const noexcept case 7: return reprap.GetGCodes().IsReallyPrinting() || reprap.GetGCodes().IsResuming(); case 10: return MassStorage::IsDriveMounted(0); case 11: return !MassStorage::IsDriveMounted(0); - case 20: return reprap.GetCurrentOrDefaultTool()->HasTemperatureFault(); + case 20: + { const auto tool = reprap.GetCurrentOrDefaultTool(); // this can be null, especially during startup + return tool.IsNotNull() && tool->HasTemperatureFault(); + } case 28: return reprap.GetHeat().GetStatus(reprap.GetHeat().GetBedHeater(0)) == HeaterStatus::fault; } } |