diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs index 8842677bf..8dd2e6144 100644 --- a/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs +++ b/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs @@ -207,9 +207,11 @@ internal class CursesDriver : ConsoleDriver { StopReportingMouseMoves (); SetCursorVisibility (CursorVisibility.Default); - _mainLoop.RemoveWatch (_processInputToken); - _mainLoop.WinChanged -= ProcessInput; - + if (_mainLoop != null) { + _mainLoop.RemoveWatch (_processInputToken); + _mainLoop.WinChanged -= ProcessInput; + } + if (RunningUnitTests) { return; }