potential solution for #31?
This commit is contained in:
parent
645c9e72d2
commit
90fc53ce00
2 changed files with 33 additions and 23 deletions
|
@ -49,5 +49,5 @@ using System.Windows;
|
||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("2.18")]
|
[assembly: AssemblyVersion("2.19")]
|
||||||
[assembly: AssemblyFileVersion("2.18")]
|
[assembly: AssemblyFileVersion("2.19")]
|
||||||
|
|
|
@ -153,28 +153,38 @@ namespace EnvyUpdate
|
||||||
|
|
||||||
Debug.LogToFile("INFO Got Nvidia GPU list.");
|
Debug.LogToFile("INFO Got Nvidia GPU list.");
|
||||||
if (xmlcontent == null)
|
if (xmlcontent == null)
|
||||||
Debug.LogToFile("WARN GPU list is NULL! This is a possible error source.");
|
|
||||||
|
|
||||||
XDocument xDoc = XDocument.Parse(xmlcontent);
|
|
||||||
string gpuName = GetGPUName(true);
|
|
||||||
|
|
||||||
switch (IDtype)
|
|
||||||
{
|
{
|
||||||
case "psid":
|
Debug.LogToFile("WARN GPU list is NULL! This is a possible error source.");
|
||||||
id = GetValueFromName(xDoc, gpuName, true);
|
switch (IDtype)
|
||||||
Debug.LogToFile("INFO Got psid: " + id);
|
{
|
||||||
break;
|
case "osid":
|
||||||
case "pfid":
|
id = GetOSID();
|
||||||
id = GetValueFromName(xDoc, gpuName, false);
|
Debug.LogToFile("WARN Ignore previous warning, just getting osid.");
|
||||||
Debug.LogToFile("INFO Got pfid: " + id);
|
Debug.LogToFile("INFO Got osid: " + id);
|
||||||
break;
|
break;
|
||||||
case "osid":
|
default:
|
||||||
id = GetOSID();
|
Debug.LogToFile("WARN GetIDs was called, but nothing was specified.");
|
||||||
Debug.LogToFile("INFO Got osid: " + id);
|
break;
|
||||||
break;
|
}
|
||||||
default:
|
}
|
||||||
Debug.LogToFile("WARN GetIDs was called, but nothing was specified.");
|
else
|
||||||
break;
|
{
|
||||||
|
XDocument xDoc = XDocument.Parse(xmlcontent);
|
||||||
|
string gpuName = GetGPUName(true);
|
||||||
|
switch (IDtype)
|
||||||
|
{
|
||||||
|
case "psid":
|
||||||
|
id = GetValueFromName(xDoc, gpuName, true);
|
||||||
|
Debug.LogToFile("INFO Got psid: " + id);
|
||||||
|
break;
|
||||||
|
case "pfid":
|
||||||
|
id = GetValueFromName(xDoc, gpuName, false);
|
||||||
|
Debug.LogToFile("INFO Got pfid: " + id);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Debug.LogToFile("WARN GetIDs was called, but nothing was specified.");
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return id;
|
return id;
|
||||||
|
|
Reference in a new issue