From f7947771cb5ca99ddf76b2c1ea07ce54f70dfb5c Mon Sep 17 00:00:00 2001 From: "E. C. Masloch" Date: Thu, 1 Aug 2024 20:58:03 +0200 Subject: [PATCH] config: only overwrite skip config prompt if it was displayed This allows to boot with SWITCHES=/F without any lone CRs. --- kernel/config.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/config.c b/kernel/config.c index 701ef09..27e8ac7 100644 --- a/kernel/config.c +++ b/kernel/config.c @@ -1085,14 +1085,15 @@ STATIC BOOL SkipLine(char *pLine) { short key; COUNT i; + signed char originalskipconfigseconds = InitKernelConfig.SkipConfigSeconds; - if (InitKernelConfig.SkipConfigSeconds >= 0) + if (originalskipconfigseconds >= 0) { - if (InitKernelConfig.SkipConfigSeconds > 0) + if (originalskipconfigseconds > 0) printf("Press F8 to trace or F5 to skip CONFIG.SYS/AUTOEXEC.BAT"); - key = GetBiosKey(InitKernelConfig.SkipConfigSeconds); /* wait 2 seconds */ + key = GetBiosKey(originalskipconfigseconds); /* wait 2 seconds */ InitKernelConfig.SkipConfigSeconds = -1; @@ -1105,7 +1106,8 @@ STATIC BOOL SkipLine(char *pLine) singleStep = TRUE; } - printf("\r%79s\r", ""); /* clear line */ + if (originalskipconfigseconds > 0) + printf("\r%79s\r", ""); /* clear line */ if (SkipAllConfig) printf("Skipping CONFIG.SYS/AUTOEXEC.BAT\n");