From b934a4c612a09cfd577e3811df01e8a2fdbb81dd Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 12 May 2022 23:40:56 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20printer=5Fbusy,=20M73?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to "Misc. LCD cleanup"
---
 Marlin/src/lcd/e3v2/proui/dwin.cpp         | 2 +-
 Marlin/src/lcd/menu/menu_advanced.cpp      | 1 +
 Marlin/src/lcd/menu/menu_configuration.cpp | 2 ++
 Marlin/src/lcd/menu/menu_filament.cpp      | 3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 68d4010ef6..7d87725b81 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1652,8 +1652,8 @@ void DWIN_Print_Aborted() {
 }
 
 // Progress Bar update
-  if (parser.seenval('P')) _percent_done = parser.byteval('P');
 void DWIN_M73() {
+  if (parser.seenval('P')) _percent_done = parser.byteval('P');
   if (parser.seenval('R')) {
     _remain_time = parser.ulongval('R') * 60;
     HMI_flag.remain_flag = true;
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 214ff133b2..b786931a42 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -29,6 +29,7 @@
 #if HAS_MARLINUI_MENU
 
 #include "menu_item.h"
+#include "../../MarlinCore.h"
 #include "../../module/planner.h"
 
 #if DISABLED(NO_VOLUMETRICS)
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index f91ea60ad9..d755706b16 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -30,6 +30,8 @@
 
 #include "menu_item.h"
 
+#include "../../MarlinCore.h"
+
 #if HAS_FILAMENT_SENSOR
   #include "../../feature/runout.h"
 #endif
diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp
index 9f432c405c..03ac6e512c 100644
--- a/Marlin/src/lcd/menu/menu_filament.cpp
+++ b/Marlin/src/lcd/menu/menu_filament.cpp
@@ -35,6 +35,9 @@
 #if HAS_FILAMENT_SENSOR
   #include "../../feature/runout.h"
 #endif
+#if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
+  #include "../../MarlinCore.h"
+#endif
 
 //
 // Change Filament > Change/Unload/Load Filament