diff --git a/HandheldCompanion.iss b/HandheldCompanion.iss
index fa67542e7..6dd3e4283 100644
--- a/HandheldCompanion.iss
+++ b/HandheldCompanion.iss
@@ -215,19 +215,6 @@ begin
Result := ShellExec('', ExpandConstant('{tmp}{\}') + 'netcorecheck' + Dependency_ArchSuffix + '.exe', Version, '', SW_HIDE, ewWaitUntilTerminated, ResultCode) and (ResultCode = 0);
end;
-procedure Dependency_AddDotNet80;
-begin
- // https://dotnet.microsoft.com/en-us/download/dotnet/8.0
- if not Dependency_IsNetCoreInstalled('Microsoft.NETCore.App 8.0.0') then begin
- Dependency_Add('dotNet80' + Dependency_ArchSuffix + '.exe',
- '/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
- '.NET Runtime 8.0.0' + Dependency_ArchTitle,
- Dependency_String('https://download.visualstudio.microsoft.com/download/pr/7f4d5cbc-4449-4ea5-9578-c467821f251f/b9b19f89d0642bf78f4b612c6a741637/dotnet-runtime-8.0.0-win-x64.exe',
- 'https://download.visualstudio.microsoft.com/download/pr/593685c9-7e98-455a-8e34-4b8ad1be9489/6ccf85c6fc244428d61f74ca3aee0645/dotnet-runtime-8.0.0-win-x86.exe'),
- '', False, False);
- end;
-end;
-
procedure Dependency_AddDotNet80Desktop;
begin
// https://dotnet.microsoft.com/en-us/download/dotnet/8.0
@@ -325,17 +312,17 @@ end;
procedure Dependency_AddHideHide;
begin
- Dependency_Add('HidHide_1.4.186_x64.exe',
- '/quiet /norestart',
+ Dependency_Add('HidHide_1.4.192_x64.exe',
+ '',
'HidHide Drivers',
- 'https://github.com/nefarius/HidHide/releases/download/v1.4.186.0/HidHide_1.4.186_x64.exe',
+ 'https://github.com/nefarius/HidHide/releases/download/v1.4.192.0/HidHide_1.4.192_x64.exe',
'', True, False);
end;
procedure Dependency_AddViGem;
begin
Dependency_Add('ViGEmBus_1.22.0_x64_x86_arm64.exe',
- '/quiet /norestart',
+ '',
'ViGEmBus Setup',
'https://github.com/nefarius/ViGEmBus/releases/download/v1.22.0/ViGEmBus_1.22.0_x64_x86_arm64.exe',
'', True, False);
@@ -343,19 +330,19 @@ end;
procedure Dependency_AddRTSS;
begin
- Dependency_Add('RTSSSetup734.exe',
+ Dependency_Add('RTSSSetup735Beta5.exe',
'/S',
- 'RTSS Setup v7.3.4',
- 'https://github.com/Valkirie/HandheldCompanion/raw/main/redist/RTSSSetup734.exe',
+ 'RTSS Setup v7.3.5 Beta5',
+ 'https://github.com/Valkirie/HandheldCompanion/raw/main/redist/RTSSSetup735Beta5.exe',
'', True, False);
end;
procedure Dependency_AddHWiNFO;
begin
- Dependency_Add('hwi_746.exe',
+ Dependency_Add('hwi_766.exe',
'/silent',
- 'HWiNFO v7.4.6',
- 'https://github.com/Valkirie/HandheldCompanion/raw/main/redist/hwi_746.exe',
+ 'HWiNFO v7.6.6',
+ 'https://github.com/Valkirie/HandheldCompanion/raw/main/redist/hwi_766.exe',
'', True, False);
end;
@@ -387,7 +374,7 @@ end;
#define MyAppSetupName 'Handheld Companion'
#define MyBuildId 'HandheldCompanion'
-#define MyAppVersion '0.19.0.3'
+#define MyAppVersion '0.19.0.6'
#define MyAppPublisher 'BenjaminLSR'
#define MyAppCopyright 'Copyright @ BenjaminLSR'
#define MyAppURL 'https://github.com/Valkirie/HandheldCompanion'
@@ -453,7 +440,7 @@ Name: "{commondesktop}\{#MyAppSetupName}"; Filename: "{app}\{#MyAppExeName}"; Ta
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"
[UninstallRun]
-Filename: "C:\Program Files\Nefarius Software Solutions e.U\HidHideCLI\HidHideCLI.exe"; Parameters: "--cloak-off" ; RunOnceId: "CloakOff"; Flags: runascurrentuser runhidden
+Filename: "C:\Program Files\Nefarius Software Solutions\HidHide\x64\HidHideCLI.exe"; Parameters: "--cloak-off" ; RunOnceId: "CloakOff"; Flags: runascurrentuser runhidden
[UninstallDelete]
Type: filesandordirs; Name: "{app}"
diff --git a/HandheldCompanion/Controllers/LegionController.cs b/HandheldCompanion/Controllers/LegionController.cs
index b706827a3..759306bd0 100644
--- a/HandheldCompanion/Controllers/LegionController.cs
+++ b/HandheldCompanion/Controllers/LegionController.cs
@@ -191,11 +191,6 @@ public override void UpdateInputs(long ticks, bool commit)
base.UpdateInputs(ticks, false);
- // Potential Focus Switched instruction coming through from Legion Controllers
- // We double check the validity of the received Data
- if (Data[40] == 0)
- return;
-
FrontEnum frontButton = (FrontEnum)Data[FRONT_IDX];
Inputs.ButtonState[ButtonFlags.OEM1] = frontButton.HasFlag(FrontEnum.LegionR);
Inputs.ButtonState[ButtonFlags.OEM2] = frontButton.HasFlag(FrontEnum.LegionL);
diff --git a/HandheldCompanion/HandheldCompanion.csproj b/HandheldCompanion/HandheldCompanion.csproj
index 4fc840f2a..32bd1ba52 100644
--- a/HandheldCompanion/HandheldCompanion.csproj
+++ b/HandheldCompanion/HandheldCompanion.csproj
@@ -12,7 +12,7 @@
HandheldCompanion.App
$(SolutionDir)bin\$(Configuration)
Resources\icon.ico
- 0.19.0.3
+ 0.19.0.6
app.manifest
AnyCPU;x64;x86
true
diff --git a/HandheldCompanion/Managers/ControllerManager.cs b/HandheldCompanion/Managers/ControllerManager.cs
index 8db3a2fd9..350dee29d 100644
--- a/HandheldCompanion/Managers/ControllerManager.cs
+++ b/HandheldCompanion/Managers/ControllerManager.cs
@@ -562,9 +562,14 @@ private static void Watchdog_Elapsed(object? sender, ElapsedEventArgs e)
lock (updateLock)
{
// monitoring unexpected slot changes
- foreach (XInputController xInputController in Controllers.Values.Where(c => c.Details.isXInput))
+ foreach (XInputController xInputController in Controllers.Values.Where(c => c.Details is not null && c.Details.isXInput))
{
byte UserIndex = DeviceManager.GetXInputIndexAsync(xInputController.Details.baseContainerDevicePath);
+
+ // controller is not ready yet
+ if (UserIndex == byte.MaxValue)
+ continue;
+
xInputController.AttachController(UserIndex);
}
@@ -596,14 +601,14 @@ private static void Watchdog_Elapsed(object? sender, ElapsedEventArgs e)
foreach (IXbox360Controller placeholder in placeholders)
{
placeholder.Connect();
- Task.Delay(500);
+ Thread.Sleep(500);
}
// disconnect all virtual controllers
foreach (IXbox360Controller placeholder in placeholders)
{
placeholder.Disconnect();
- Task.Delay(500);
+ Thread.Sleep(500);
}
// clear array
diff --git a/UpdateUninstallWizard.iss b/UpdateUninstallWizard.iss
index f2dae6ee2..199b11385 100644
--- a/UpdateUninstallWizard.iss
+++ b/UpdateUninstallWizard.iss
@@ -141,7 +141,8 @@ begin
keepHidhideCheckbox.Left := UninstallProgressForm.StatusLabel.Left;
keepHidhideCheckbox.Top := keepVigemCheckbox.Top + PageText.height + 6;
keepHidhideCheckbox.Caption := 'Keep HidHide';
- keepHidhideCheckbox.checked:= false;
+ keepHidhideCheckbox.checked := false;
+ keepHidhideCheckbox.Enabled := false;
UninstallNextButton := TNewButton.Create(UninstallProgressForm);
UninstallNextButton.Parent := UninstallProgressForm;
diff --git a/redist/HidHide_1.4.186_x64.exe b/redist/HidHide_1.4.192_x64.exe
similarity index 71%
rename from redist/HidHide_1.4.186_x64.exe
rename to redist/HidHide_1.4.192_x64.exe
index 8353d0535..4c471e774 100644
Binary files a/redist/HidHide_1.4.186_x64.exe and b/redist/HidHide_1.4.192_x64.exe differ
diff --git a/redist/RTSSSetup734.exe b/redist/RTSSSetup735Beta5.exe
similarity index 63%
rename from redist/RTSSSetup734.exe
rename to redist/RTSSSetup735Beta5.exe
index 33a2ab5eb..d39579399 100644
Binary files a/redist/RTSSSetup734.exe and b/redist/RTSSSetup735Beta5.exe differ
diff --git a/redist/hwi_746.exe b/redist/hwi_766.exe
similarity index 55%
rename from redist/hwi_746.exe
rename to redist/hwi_766.exe
index 1f10752f3..d71ef3df8 100644
Binary files a/redist/hwi_746.exe and b/redist/hwi_766.exe differ
diff --git a/redist/windowsdesktop-runtime-7.0.10-win-x64.exe b/redist/windowsdesktop-runtime-8.0.0-win-x64.exe
similarity index 80%
rename from redist/windowsdesktop-runtime-7.0.10-win-x64.exe
rename to redist/windowsdesktop-runtime-8.0.0-win-x64.exe
index 83aa3bf0f..19e4c0a89 100644
Binary files a/redist/windowsdesktop-runtime-7.0.10-win-x64.exe and b/redist/windowsdesktop-runtime-8.0.0-win-x64.exe differ