diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-08-25 21:54:00 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-08-25 21:54:00 -0400 |
| commit | 211f89821e34bb55a6266384d9bac68ec0c64744 (patch) | |
| tree | aa0d9915b01aad436ed6b1a2028602c048666457 /src/SMAPI/Framework/Logging/LogManager.cs | |
| parent | 80d3dd1f786f7e5846f9adb7f7a4d82e5b9b92fd (diff) | |
| parent | 31ac964a8b19623b0472931403a33d51db6fb271 (diff) | |
| download | SMAPI-211f89821e34bb55a6266384d9bac68ec0c64744.tar.gz SMAPI-211f89821e34bb55a6266384d9bac68ec0c64744.tar.bz2 SMAPI-211f89821e34bb55a6266384d9bac68ec0c64744.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI/Framework/Logging/LogManager.cs')
| -rw-r--r-- | src/SMAPI/Framework/Logging/LogManager.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/SMAPI/Framework/Logging/LogManager.cs b/src/SMAPI/Framework/Logging/LogManager.cs index a3d4f23d..c6faa90d 100644 --- a/src/SMAPI/Framework/Logging/LogManager.cs +++ b/src/SMAPI/Framework/Logging/LogManager.cs @@ -109,9 +109,12 @@ namespace StardewModdingAPI.Framework.Logging output.OnMessageIntercepted += message => this.HandleConsoleMessage(this.MonitorForGame, message); Console.SetOut(output); - // enable Unicode handling + // enable Unicode handling on Windows + // (the terminal defaults to UTF-8 on Linux/macOS) +#if SMAPI_FOR_WINDOWS Console.InputEncoding = Encoding.Unicode; Console.OutputEncoding = Encoding.Unicode; +#endif } /// <summary>Get a monitor instance derived from SMAPI's current settings.</summary> @@ -162,8 +165,6 @@ namespace StardewModdingAPI.Framework.Logging // keep console thread alive while the game is running while (continueWhile()) Thread.Sleep(1000 / 10); - if (inputThread.ThreadState == ThreadState.Running) - inputThread.Abort(); } /// <summary>Show a 'press any key to exit' message, and exit when they press a key.</summary> |