From 7e7599ab166efa015cad683b82c1cbe3a79041ed Mon Sep 17 00:00:00 2001 From: BDisp Date: Tue, 4 Jun 2024 14:12:46 +0100 Subject: [PATCH] Preventing _inputReadyCancellationTokenSource being null. --- Terminal.Gui/ConsoleDrivers/NetDriver.cs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Terminal.Gui/ConsoleDrivers/NetDriver.cs b/Terminal.Gui/ConsoleDrivers/NetDriver.cs index dacb6b0f6..0dd0e9038 100644 --- a/Terminal.Gui/ConsoleDrivers/NetDriver.cs +++ b/Terminal.Gui/ConsoleDrivers/NetDriver.cs @@ -223,7 +223,7 @@ internal class NetEvents : IDisposable private void ProcessInputQueue () { - while (!_inputReadyCancellationTokenSource.Token.IsCancellationRequested) + while (_inputReadyCancellationTokenSource is { IsCancellationRequested: false }) { try { @@ -242,13 +242,8 @@ internal class NetEvents : IDisposable ConsoleModifiers mod = 0; ConsoleKeyInfo newConsoleKeyInfo = default; - while (true) + while (_inputReadyCancellationTokenSource is { IsCancellationRequested: false }) { - if (_inputReadyCancellationTokenSource.Token.IsCancellationRequested) - { - return; - } - ConsoleKeyInfo consoleKeyInfo; try @@ -367,13 +362,8 @@ internal class NetEvents : IDisposable cancellationToken.ThrowIfCancellationRequested (); } - while (true) + while (_inputReadyCancellationTokenSource is { IsCancellationRequested: false }) { - if (_inputReadyCancellationTokenSource.IsCancellationRequested) - { - return; - } - try { _winChange.Wait (_inputReadyCancellationTokenSource.Token);