clear submenu screen under more conditions

1 files changed, 7 insertions, 4 deletions

diff --git a/menus.c b/menus.c
index 8cca8a4..8a33f4d 100644
--- a/menus.c
+++ b/menus.c
@@ -1246,14 +1246,17 @@ static void Submenu_Display(int redraw)
 
 	current_operating_mode=0;
 
+        if (    (globals.MenuStatus.Type_Of_Menu != Submenu_On) ||
+                (globals.MenuStatus.Error_Screen == YES) ||
+                (globals.MenuStatus.Nonstd_Display == YES) || 
+		(!redraw)) {
+                LCD_clear();
+        }
+
 	globals.MenuStatus.Type_Of_Menu=Submenu_On;
 	globals.MenuStatus.Error_Screen=NO;
 	globals.MenuStatus.Nonstd_Display=NO;
 
-	if (!redraw) {
-		LCD_clear();
-	}
-
 	Submenu_Numeric_Parameter=Show_No_Number;
 	Submenu_max_entry=0;