M0/M1 no longer turns heaters off if stop.g/sleep.g is found

1 files changed, 5 insertions, 2 deletions

diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp
index 8b2e552a..60196f6b 100644
--- a/src/GCodes/GCodes2.cpp
+++ b/src/GCodes/GCodes2.cpp
@@ -549,8 +549,11 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx
 							// The state will be changed a few lines down, so no need to reset it to normal here
 						}
 
-						gb.SetState(GCodeState::stoppingWithHeatersOff);
-						(void)DoFileMacro(gb, (code == 0) ? STOP_G : SLEEP_G, false, SystemHelperMacroCode);
+						gb.SetState(GCodeState::stopping);
+						if (!DoFileMacro(gb, (code == 0) ? STOP_G : SLEEP_G, false, SystemHelperMacroCode))
+						{
+							reprap.GetHeat().SwitchOffAll(true);
+						}
 					}
 				}
 				break;