Merge pull request #16 from mayuki/hotfix/RedirectedConsole

Fix an error that occured when running in a redirected console
mayuki · Jan 15, 2022 · 2d279f1 · 2d279f1
2 parents 7b3faa8 + b87b8fe
commit 2d279f1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>1.4.0</VersionPrefix>
+    <VersionPrefix>1.4.1</VersionPrefix>
     <LangVersion>latest</LangVersion>
 
     <Authors>Mayuki Sawatari</Authors>

diff --git a/Kurukuru/Spinner.cs b/Kurukuru/Spinner.cs
@@ -133,21 +133,31 @@ private void Render(string terminator)
             {
                 lock (Console.Out)
                 {
-                    var currentLeft = Console.CursorLeft;
-                    var currentTop = Console.CursorTop;
-
-                    ConsoleHelper.ClearCurrentConsoleLine(_lineLength, _enabled ? _cursorTop : currentTop);
-                    ConsoleHelper.WriteWithColor(frame, Color ?? Console.ForegroundColor);
-                    Console.Write(" ");
-                    Console.Write(Text);
-                    _lineLength = Console.CursorLeft; // get line length before write terminator
-                    Console.Write(terminator);
-                    Console.Out.Flush();
-
                     if (_enabled)
                     {
+                        var currentLeft = Console.CursorLeft;
+                        var currentTop = Console.CursorTop;
+
+                        ConsoleHelper.ClearCurrentConsoleLine(_lineLength, _enabled ? _cursorTop : currentTop);
+                        ConsoleHelper.WriteWithColor(frame, Color ?? Console.ForegroundColor);
+                        Console.Write(" ");
+                        Console.Write(Text);
+                        _lineLength = Console.CursorLeft; // get line length before write terminator
+                        Console.Write(terminator);
+                        Console.Out.Flush();
+
                         Console.SetCursorPosition(currentLeft, currentTop);
                     }
+                    else
+                    {
+
+                        ConsoleHelper.WriteWithColor(frame, Color ?? Console.ForegroundColor);
+                        Console.Write(" ");
+                        Console.Write(Text);
+                        _lineLength = frame.Length + 1 + Text.Length;
+                        Console.Write(terminator);
+                        Console.Out.Flush();
+                    }
                 }
             }
         }