fix Linux systems with libhybris-utils installed incorrectly detected as Android (#668)

2 files changed, 19 insertions, 14 deletions

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 217b0f34..8e1b9f1c 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -7,6 +7,7 @@
   * Added friendly log message for save file-not-found errors.
   * Updated for the 'Force Off' gamepad mode added in Stardew Valley 1.4.1.
   * Fixed compatibility with Linux Mint 18 (thanks to techge!) and Arch Linux.
+  * Fixed compatibility with Linux systems which have libhybris-utils installed.
   * Internal optimizations.
 
 * For modders:
diff --git a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
index 6dce5da5..2a01fe4b 100644
--- a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
@@ -105,23 +105,27 @@ namespace StardewModdingAPI.Toolkit.Utilities
         /// </remarks>
         private static bool IsRunningAndroid()
         {
-            using (Process process = new Process())
+            using Process process = new Process
             {
-                process.StartInfo.FileName = "getprop";
-                process.StartInfo.Arguments = "ro.build.user";
-                process.StartInfo.RedirectStandardOutput = true;
-                process.StartInfo.UseShellExecute = false;
-                process.StartInfo.CreateNoWindow = true;
-                try
+                StartInfo =
                 {
-                    process.Start();
-                    string output = process.StandardOutput.ReadToEnd();
-                    return !string.IsNullOrEmpty(output);
-                }
-                catch
-                {
-                    return false;
+                    FileName = "getprop",
+                    Arguments = "ro.build.user",
+                    RedirectStandardOutput = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true
                 }
+            };
+
+            try
+            {
+                process.Start();
+                string output = process.StandardOutput.ReadToEnd();
+                return !string.IsNullOrWhiteSpace(output);
+            }
+            catch
+            {
+                return false;
             }
         }