summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs17
1 files changed, 11 insertions, 6 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
index af4a57bcd..2ea664f1a 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs
@@ -129,21 +129,26 @@ namespace HandBrake.ApplicationServices.Utilities
List<string> gpuInfo = new List<string>();
ManagementObjectSearcher searcher = new ManagementObjectSearcher(
"select * from " + "Win32_VideoController");
+
foreach (ManagementObject share in searcher.Get())
{
string gpu = string.Empty, version = string.Empty;
foreach (PropertyData PC in share.Properties)
{
- if (PC.Name.Equals("DriverVersion")) version = PC.Value.ToString();
-
-
- if (PC.Name.Equals("Name"))
- gpu = PC.Value.ToString();
+ if (!string.IsNullOrEmpty(PC.Name) && PC.Value != null)
+ {
+ if (PC.Name.Equals("DriverVersion")) version = PC.Value.ToString();
+ if (PC.Name.Equals("Name")) gpu = PC.Value.ToString();
+ }
}
- gpuInfo.Add(string.Format("{0} - {1}", gpu, version));
+ if (!string.IsNullOrEmpty(gpu) && !string.IsNullOrEmpty(version))
+ {
+ gpuInfo.Add(string.Format("{0} - {1}", gpu, version));
+ }
}
+
return gpuInfo;
}
}