Merge pull request #2266 from AaronLieberman/unix-idle-fix

tig · web-flow · commit d5abc2001fb2 · 2023-01-02T17:33:12.000-07:00
Fixes #2265 - Keyboard input doesn't work in UnixMainLoop when Idle function is registered
diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs
@@ -181,16 +181,15 @@ bool IMainLoopDriver.EventsPending (bool wait)
 		{
 			UpdatePollMap ();
 
-			if (CheckTimers (wait, out var pollTimeout)) {
-				return true;
-			}
+			bool checkTimersResult = CheckTimers (wait, out var pollTimeout);
 
 			var n = poll (pollmap, (uint)pollmap.Length, pollTimeout);
 
 			if (n == KEY_RESIZE) {
 				winChanged = true;
 			}
-			return n >= KEY_RESIZE || CheckTimers (wait, out pollTimeout);
+
+			return checkTimersResult || n >= KEY_RESIZE;
 		}
 
 		bool CheckTimers (bool wait, out int pollTimeout)

Original file line number	Diff line number	Diff line change
`@@ -181,16 +181,15 @@ bool IMainLoopDriver.EventsPending (bool wait)`
`181`	`181`	`{`
`182`	`182`	`UpdatePollMap ();`
`183`	`183`
`184`		`- if (CheckTimers (wait, out var pollTimeout)) {`
`185`		`- return true;`
`186`		`- }`
	`184`	`+ bool checkTimersResult = CheckTimers (wait, out var pollTimeout);`
`187`	`185`
`188`	`186`	`var n = poll (pollmap, (uint)pollmap.Length, pollTimeout);`
`189`	`187`
`190`	`188`	`if (n == KEY_RESIZE) {`
`191`	`189`	`winChanged = true;`
`192`	`190`	`}`
`193`		`- return n >= KEY_RESIZE \|\| CheckTimers (wait, out pollTimeout);`
	`191`	`+`
	`192`	`+ return checkTimersResult \|\| n >= KEY_RESIZE;`
`194`	`193`	`}`
`195`	`194`
`196`	`195`	`bool CheckTimers (bool wait, out int pollTimeout)`