Fix CTRL + C

NuclearPowered · Apr 14, 2021 · 9560e5f · 9560e5f
1 parent b2efec1
commit 9560e5f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Impostor.Server/Input/ConsoleInputService.cs b/src/Impostor.Server/Input/ConsoleInputService.cs
@@ -36,7 +36,19 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             {
                 try
                 {
-                    var line = _susLine?.ReadLine(stoppingToken) ?? Console.ReadLine();
+                    string? line;
+
+                    if (_config.SusLine)
+                    {
+                        line = await _susLine!.ReadLineAsync(stoppingToken);
+                    }
+                    else
+                    {
+                        var task = Task.Run(Console.ReadLine, stoppingToken);
+                        await Task.WhenAny(task, Task.Delay(Timeout.Infinite, stoppingToken));
+
+                        line = task.IsCompleted ? task.GetAwaiter().GetResult() : null;
+                    }
 
                     if (string.IsNullOrEmpty(line))
                     {

diff --git a/src/Impostor.Server/Input/SusLine.cs b/src/Impostor.Server/Input/SusLine.cs
@@ -4,6 +4,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Impostor.Server.Input
 {
@@ -29,7 +30,7 @@ public SusLine()
         /// </summary>
         /// <param name="stoppingToken"><see cref="CancellationToken"/> for a while loop.</param>
         /// <returns>The next line of characters from the input stream, or null if no more lines are available.</returns>
-        public string? ReadLine(CancellationToken stoppingToken)
+        public async ValueTask<string?> ReadLineAsync(CancellationToken stoppingToken)
         {
             while (!stoppingToken.IsCancellationRequested)
             {
@@ -38,7 +39,7 @@ public SusLine()
                     continue;
                 }
 
-                var keyInfo = Console.ReadKey(true);
+                var keyInfo = await Task<ConsoleKeyInfo>.Factory.StartNew(static _ => Console.ReadKey(true), this, stoppingToken, TaskCreationOptions.DenyChildAttach, TaskScheduler.Default);
 
                 switch (keyInfo.Key)
                 {