Improve Wine info (#35)

* Improve Wine info * Update WineInfo.cs
northwood-studios · Jul 19, 2023 · 5df6f9f · 5df6f9f
1 parent 7cb2117
commit 5df6f9f
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/NorthwoodLib/WineInfo.cs b/NorthwoodLib/WineInfo.cs
@@ -115,22 +115,22 @@ static WineInfo()
 				WineVersion = "Wine Hidden";
 			}
 
-			UsesProton = kernelBase.IndexOf("Proton "u8) >= 0;
-			if (UsesProton)
-				WineVersion = $"Proton {WineVersion}";
-
 			try
 			{
 				string wineBuild = Marshal.PtrToStringAnsi((nint)GetWineBuildId());
 
 				if (!string.IsNullOrWhiteSpace(wineBuild))
-					WineVersion += $" {wineBuild}";
+					WineVersion = wineBuild;
 			}
 			catch (Exception ex)
 			{
 				PlatformSettings.Log($"Wine build not detected: {ex.Message}", LogType.Debug);
 			}
 
+			UsesProton = kernelBase.IndexOf("Proton "u8) >= 0;
+			if (UsesProton)
+				WineVersion = $"Proton {WineVersion}";
+
 			try
 			{
 				byte* sysnamePtr = null;
@@ -140,12 +140,11 @@ static WineInfo()
 				string release = Marshal.PtrToStringAnsi((nint)releasePtr)?.Trim() ?? "";
 				if (sysname != "" || release != "")
 				{
-					WineHost = "Host:";
-					if (!string.IsNullOrWhiteSpace(sysname))
-						WineHost += $" {sysname}";
+					WineHost = sysname;
 					if (!string.IsNullOrWhiteSpace(release))
 						WineHost += $" {release}";
-					WineVersion += $" Host:{WineHost}";
+					WineHost = WineHost.Trim();
+					WineVersion += $" Host: {WineHost}";
 				}
 			}
 			catch (Exception ex)