fix system data extraction

msartore · May 14, 2024 · 68b3c38 · 68b3c38
1 parent 5433ae6
commit 68b3c38
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/ATA-GUI/ATA-GUI.csproj b/ATA-GUI/ATA-GUI.csproj
@@ -10,9 +10,9 @@
 		<Copyright>© 2021-2024 Massimiliano Sartore</Copyright>
 
 		<!-- Versioning -->
-		<Version>3.7.1.0</Version>
-		<AssemblyVersion>3.7.1.0</AssemblyVersion>
-		<FileVersion>3.7.1.0</FileVersion>
+		<Version>3.7.2.0</Version>
+		<AssemblyVersion>3.7.2.0</AssemblyVersion>
+		<FileVersion>3.7.2.0</FileVersion>
 
 		<!-- Publish settings -->
 		<PublishUrl>publish\</PublishUrl>

diff --git a/ATA-GUI/Classes/ATA.cs b/ATA-GUI/Classes/ATA.cs
@@ -10,7 +10,7 @@ namespace ATA_GUI.Classes
 {
     internal class ATA
     {
-        public static readonly string CURRENTVERSION = "v3.7.1";
+        public static readonly string CURRENTVERSION = "v3.7.2";
         public static readonly string IPFileName = "IPList.txt";
 
         public HashSet<string> IPList { get; } = new HashSet<string>();

diff --git a/ATA-GUI/Utils/ConsoleProcess.cs b/ATA-GUI/Utils/ConsoleProcess.cs
@@ -50,17 +50,21 @@ public static string adbFastbootCommandR(string[] args, int type)
                 using Process process = new() { StartInfo = startInfo };
                 process.Start();
 
-                string error = process.StandardError.ReadToEnd();
+                if (type == 1)
+                {
+                    string error = process.StandardError.ReadToEnd();
+
+                    if (!string.IsNullOrEmpty(error))
+                    {
+                        ret.AppendLine(error);
+                    }
+                }
                 string output = process.StandardOutput.ReadToEnd();
 
                 if (!string.IsNullOrEmpty(output))
                 {
                     ret.AppendLine(output);
                 }
-                if (!string.IsNullOrEmpty(error))
-                {
-                    ret.AppendLine(error);
-                }
 
                 process.WaitForExit();
             }