X-Git-Url: https://code.delx.au/refind/blobdiff_plain/631e27718ed09c4ae18c03567b9b31fc62266ed3..2cc79ea9b33424d5fc32f15683adf7c956656b9b:/refind/menu.c

diff --git a/refind/menu.c b/refind/menu.c
index ab39137..e55bcf4 100644
--- a/refind/menu.c
+++ b/refind/menu.c
@@ -444,18 +444,39 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty
                 // timeout expired
                 MenuExit = MENU_EXIT_TIMEOUT;
                 break;
-            } else if (HaveTimeout) {
-                refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
-                TimeoutCountdown--;
-                TimeSinceKeystroke++;
-            } else if (GlobalConfig.ScreensaverTime > 0) {
-                refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
-                TimeSinceKeystroke++;
-                if (TimeSinceKeystroke > (GlobalConfig.ScreensaverTime * 10)) {
-                   SaveScreen();
-                   State.PaintAll = TRUE;
-                   TimeSinceKeystroke = 0;
-                } // if
+            } else if (HaveTimeout || GlobalConfig.ScreensaverTime > 0) {
+		EFI_EVENT           TimerEvent;
+		UINTN		    ElapsCount = 1;
+
+		Status = refit_call5_wrapper(BS->CreateEvent, EVT_TIMER, 0, NULL, NULL, &TimerEvent);
+		if (EFI_ERROR(Status)) {
+		    refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
+		} else {
+		    EFI_EVENT           WaitList[2];
+		    UINTN               Index;
+
+		    refit_call3_wrapper(BS->SetTimer, TimerEvent, TimerRelative, 10000000); // 1s Timeout
+		    WaitList[0] = ST->ConIn->WaitForKey;
+		    WaitList[1] = TimerEvent;
+		    Status = refit_call3_wrapper(BS->WaitForEvent, 2, WaitList, &Index);
+		    refit_call1_wrapper(BS->CloseEvent, TimerEvent);
+		    if (EFI_ERROR(Status))
+			refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
+		    else if(Index == 0)
+			continue;
+		    else
+			ElapsCount = 10; // always counted as 1s to end of the timeout
+		}
+		TimeSinceKeystroke += ElapsCount;
+		if(HaveTimeout) {
+		    TimeoutCountdown = TimeoutCountdown <= ElapsCount ? 0 : TimeoutCountdown - ElapsCount;
+		} else if (GlobalConfig.ScreensaverTime > 0 &&
+			TimeSinceKeystroke > (GlobalConfig.ScreensaverTime * 10))
+		{
+			SaveScreen();
+			State.PaintAll = TRUE;
+			TimeSinceKeystroke = 0;
+		} // if
             } else {
                 refit_call3_wrapper(BS->WaitForEvent, 1, &ST->ConIn->WaitForKey, &index);
             }