Merge pull request #601 from cjakeman/video-ram-bugfix

cjakeman · web-flow · commit bb833f3678a0 · 2022-02-14T08:57:56.000Z
Video-RAM message to logfile fails under VMWare
diff --git a/Source/ORTS.Common/SystemInfo.cs b/Source/ORTS.Common/SystemInfo.cs
@@ -74,7 +74,8 @@ static void WriteEnvironment(TextWriter output)
             {
                 foreach (ManagementObject display in new ManagementClass("Win32_VideoController").GetInstances())
                 {
-                    output.WriteLine("Video      = {0} ({1:F1} GB RAM){2}", (string)display["Description"], (float)(uint)display["AdapterRAM"] / 1024 / 1024 / 1024, GetPnPDeviceDrivers(display));
+                    // ? used as display["AdapterRAM"] may be null on a virtual machine (e.g. VMWare)
+                    output.WriteLine("Video      = {0} ({1:F1} GB RAM){2}", (string)display["Description"], (float?)(uint?)display["AdapterRAM"] / 1024 / 1024 / 1024, GetPnPDeviceDrivers(display));
                 }
             }
             catch (Exception error)

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,8 @@ static void WriteEnvironment(TextWriter output)`
`74`	`74`	`{`
`75`	`75`	`foreach (ManagementObject display in new ManagementClass("Win32_VideoController").GetInstances())`
`76`	`76`	`{`
`77`		`- output.WriteLine("Video = {0} ({1:F1} GB RAM){2}", (string)display["Description"], (float)(uint)display["AdapterRAM"] / 1024 / 1024 / 1024, GetPnPDeviceDrivers(display));`
	`77`	`+ // ? used as display["AdapterRAM"] may be null on a virtual machine (e.g. VMWare)`
	`78`	`+ output.WriteLine("Video = {0} ({1:F1} GB RAM){2}", (string)display["Description"], (float?)(uint?)display["AdapterRAM"] / 1024 / 1024 / 1024, GetPnPDeviceDrivers(display));`
`78`	`79`	`}`
`79`	`80`	`}`
`80`	`81`	`catch (Exception error)`