Merge branch 'jay' into udpserver

This commit is contained in:
Travis Nickles 2018-07-18 01:26:24 -05:00
commit 53cd5d48d9
2 changed files with 12 additions and 3 deletions

View File

@ -159,7 +159,16 @@ namespace DS4Windows
public void ScanPurgeHidGuard()
{
RegistryKey tempkey = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Services\HidGuardian\Parameters\Whitelist");
string[] subkeys = tempkey.GetSubKeyNames();
string[] subkeys = null;
if (tempkey != null)
{
subkeys = tempkey.GetSubKeyNames();
}
else
{
subkeys = new string[0];
}
bool processExists = false;
for (int ind = 0, arlen = subkeys.Length; ind < arlen; ind++)
{

View File

@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.121")]
[assembly: AssemblyFileVersion("1.4.121")]
[assembly: AssemblyVersion("1.4.123")]
[assembly: AssemblyFileVersion("1.4.123")]
[assembly: NeutralResourcesLanguage("en")]