From 9a3119ccc255e1d88e270ba5ce6ef40a4f41b66b Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Fri, 5 Jun 2026 15:53:21 -0500
Subject: [PATCH 01/47] Fix trigger full pull threshold

---
 DS4Windows/DS4Control/DS4StateFieldMapping.cs | 10 +++-
 DS4Windows/DS4Control/Mapping.cs              | 14 ++---
 DS4WindowsTests/TriggerFullPullTests.cs       | 54 +++++++++++++++++++
 3 files changed, 69 insertions(+), 9 deletions(-)
 create mode 100644 DS4WindowsTests/TriggerFullPullTests.cs

diff --git a/DS4Windows/DS4Control/DS4StateFieldMapping.cs b/DS4Windows/DS4Control/DS4StateFieldMapping.cs
index 3da1ac7..2631d48 100644
--- a/DS4Windows/DS4Control/DS4StateFieldMapping.cs
+++ b/DS4Windows/DS4Control/DS4StateFieldMapping.cs
@@ -22,6 +22,7 @@ public class DS4StateFieldMapping
     {
         public enum ControlType : int { Unknown = 0, Button, AxisDir, Trigger, Touch, GyroDir, SwipeDir }
         public const byte LAST_DS4_ACTION = (byte)DS4Controls.TouchEnded;
+        public const byte TRIGGER_FULL_PULL_THRESHOLD = 250;
 
         public bool[] buttons = new bool[(int)LAST_DS4_ACTION + 1];
         public byte[] axisdirs = new byte[(int)LAST_DS4_ACTION + 1];
@@ -121,10 +122,10 @@ public void PopulateFieldMapping(DS4State cState, DS4StateExposed exposeState, M
                 triggers[(int)DS4Controls.R2] = cState.R2;
 
                 buttons[(int)DS4Controls.L1] = cState.L1;
-                buttons[(int)DS4Controls.L2FullPull] = cState.L2Raw == 255;
+                buttons[(int)DS4Controls.L2FullPull] = IsTriggerFullPull(cState.L2Raw);
                 buttons[(int)DS4Controls.L3] = cState.L3;
                 buttons[(int)DS4Controls.R1] = cState.R1;
-                buttons[(int)DS4Controls.R2FullPull] = cState.R2Raw == 255;
+                buttons[(int)DS4Controls.R2FullPull] = IsTriggerFullPull(cState.R2Raw);
                 buttons[(int)DS4Controls.R3] = cState.R3;
 
                 buttons[(int)DS4Controls.Cross] = cState.Cross;
@@ -183,6 +184,11 @@ public void PopulateFieldMapping(DS4State cState, DS4StateExposed exposeState, M
             }
         }
 
+        public static bool IsTriggerFullPull(byte rawTriggerValue)
+        {
+            return rawTriggerValue >= TRIGGER_FULL_PULL_THRESHOLD;
+        }
+
         public void PopulateState(DS4State state)
         {
             unchecked
diff --git a/DS4Windows/DS4Control/Mapping.cs b/DS4Windows/DS4Control/Mapping.cs
index 1d86600..e251d88 100644
--- a/DS4Windows/DS4Control/Mapping.cs
+++ b/DS4Windows/DS4Control/Mapping.cs
@@ -3112,14 +3112,14 @@ private static void ProcessTwoStageTrigger(int device, DS4State cState, byte tri
             switch (outputSettings.twoStageMode)
             {
                 case TwoStageTriggerMode.Normal:
-                    if (triggerRawValue == 255)
+                    if (DS4StateFieldMapping.IsTriggerFullPull(triggerRawValue))
                     {
                         dcsFullPull = inputFullPull;
                     }
 
                     break;
                 case TwoStageTriggerMode.ExclusiveButtons:
-                    if (triggerRawValue == 255)
+                    if (DS4StateFieldMapping.IsTriggerFullPull(triggerRawValue))
                     {
                         dcsFullPull = inputFullPull;
                         dcsTemp = null;
@@ -3145,7 +3145,7 @@ private static void ProcessTwoStageTrigger(int device, DS4State cState, byte tri
 
                     triggerData.actionStateMode = TwoStageTriggerMappingData.EngageButtonsMode.Both;
 
-                    if (triggerRawValue == 255)
+                    if (DS4StateFieldMapping.IsTriggerFullPull(triggerRawValue))
                     {
                         // Full pull now activates both. Soft pull action
                         // no longer engaged with threshold
@@ -3189,7 +3189,7 @@ private static void ProcessTwoStageTrigger(int device, DS4State cState, byte tri
                         {
                             triggerData.outputActive = true;
 
-                            if (triggerRawValue == 255)
+                            if (DS4StateFieldMapping.IsTriggerFullPull(triggerRawValue))
                             {
                                 dcsFullPull = inputFullPull;
                                 triggerData.fullPullActActive = true;
@@ -3206,7 +3206,7 @@ private static void ProcessTwoStageTrigger(int device, DS4State cState, byte tri
                     else if (triggerData.outputActive)
                     {
                         //DS4State pState = d.getPreviousStateRef();
-                        if (triggerRawValue == 255)
+                        if (DS4StateFieldMapping.IsTriggerFullPull(triggerRawValue))
                         {
                             dcsFullPull = inputFullPull;
                             triggerData.fullPullActActive = true;
@@ -3249,7 +3249,7 @@ private static void ProcessTwoStageTrigger(int device, DS4State cState, byte tri
                         {
                             triggerData.outputActive = true;
 
-                            if (triggerRawValue == 255)
+                            if (DS4StateFieldMapping.IsTriggerFullPull(triggerRawValue))
                             {
                                 dcsFullPull = inputFullPull;
                                 triggerData.fullPullActActive = true;
@@ -3268,7 +3268,7 @@ private static void ProcessTwoStageTrigger(int device, DS4State cState, byte tri
                     else if (triggerData.outputActive)
                     {
                         //DS4State pState = d.getPreviousStateRef();
-                        if (triggerRawValue == 255 &&
+                        if (DS4StateFieldMapping.IsTriggerFullPull(triggerRawValue) &&
                             triggerData.actionStateMode == TwoStageTriggerMappingData.EngageButtonsMode.FullPullOnly)
                         {
                             dcsFullPull = inputFullPull;
diff --git a/DS4WindowsTests/TriggerFullPullTests.cs b/DS4WindowsTests/TriggerFullPullTests.cs
new file mode 100644
index 0000000..ece0fba
--- /dev/null
+++ b/DS4WindowsTests/TriggerFullPullTests.cs
@@ -0,0 +1,54 @@
+/*
+DS4Windows
+Copyright (C) 2026  Travis Nickles
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+using DS4Windows;
+
+namespace DS4WindowsTests
+{
+    [TestClass]
+    public class TriggerFullPullTests
+    {
+        [DataTestMethod]
+        [DataRow(0, false)]
+        [DataRow(249, false)]
+        [DataRow(250, true)]
+        [DataRow(255, true)]
+        public void FullPullThresholdAllowsSmallRawInputTolerance(int rawTriggerValue, bool expectedFullPull)
+        {
+            Assert.AreEqual(expectedFullPull, DS4StateFieldMapping.IsTriggerFullPull((byte)rawTriggerValue));
+        }
+
+        [TestMethod]
+        public void FieldMappingUsesFullPullThresholdForTriggerButtons()
+        {
+            DS4State state = new DS4State
+            {
+                L2Raw = DS4StateFieldMapping.TRIGGER_FULL_PULL_THRESHOLD,
+                R2Raw = DS4StateFieldMapping.TRIGGER_FULL_PULL_THRESHOLD - 1
+            };
+
+            DS4StateFieldMapping mapping = new DS4StateFieldMapping(
+                state,
+                new DS4StateExposed(state),
+                tp: null);
+
+            Assert.IsTrue(mapping.buttons[(int)DS4Controls.L2FullPull]);
+            Assert.IsFalse(mapping.buttons[(int)DS4Controls.R2FullPull]);
+        }
+    }
+}

From f9afbb00ac847d630a4179352dce91dbe3118eb3 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sat, 6 Jun 2026 01:00:30 -0500
Subject: [PATCH 02/47] Prioritize Game Bar profiles over auto profiles

---
 DS4Windows/AutoProfileChecker.cs        |  43 +++++-
 DS4Windows/DS4Control/ControlService.cs | 189 +++++++++++++++++++-----
 DS4Windows/DS4Forms/MainWindow.xaml.cs  |   2 +
 3 files changed, 197 insertions(+), 37 deletions(-)

diff --git a/DS4Windows/AutoProfileChecker.cs b/DS4Windows/AutoProfileChecker.cs
index 02fa51e..24c14ce 100644
--- a/DS4Windows/AutoProfileChecker.cs
+++ b/DS4Windows/AutoProfileChecker.cs
@@ -67,6 +67,15 @@ public void Process()
 
             if (GetTopWindowName(out topProcessName, out topWindowTitle))
             {
+                if (Program.rootHub.IsAnyGameBarProfilePriorityActive() &&
+                    IsGameBarForegroundWindow(topProcessName, topWindowTitle))
+                {
+                    if (autoProfileDebugLogLevel > 0)
+                        DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. Game Bar has priority; preserving underlying auto-profile while Game Bar is foreground", false, true);
+
+                    return;
+                }
+
                 // Find a profile match based on autoprofile program path and wnd title list.
                 // The same program may set different profiles for each of the controllers, so we need an array of newProfileName[controllerIdx] values.
                 for (int i = 0, pathsLen = profileHolder.AutoProfileColl.Count; i < pathsLen; i++)
@@ -122,6 +131,11 @@ public void Process()
                             controllerProfileEntity.ProfileNames[0] : controllerProfileEntity.ProfileNames[j];
                         if (tempname != string.Empty && tempname != "(none)")
                         {
+                            if (Program.rootHub.TryDeferAutoProfileForGameBar(j, tempname))
+                            {
+                                continue;
+                            }
+
                             if ((Global.useTempProfile[j] && tempname != Global.tempprofilename[j]) ||
                                 (!Global.useTempProfile[j] && tempname != Global.ProfilePath[j]) ||
                                 forceLoadProfile)
@@ -162,13 +176,21 @@ public void Process()
 
                     if (turnOffDS4WinApp)
                     {
-                        turnOffTemp = true;
-                        if (App.rootHub.running)
+                        if (Program.rootHub.IsAnyGameBarProfilePriorityActive())
                         {
                             if (autoProfileDebugLogLevel > 0)
-                                DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. Turning DS4Windows temporarily off", false, true);
+                                DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. Turnoff rule deferred while Game Bar has priority", false, true);
+                        }
+                        else
+                        {
+                            turnOffTemp = true;
+                            if (App.rootHub.running)
+                            {
+                                if (autoProfileDebugLogLevel > 0)
+                                    DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. Turning DS4Windows temporarily off", false, true);
 
-                            SetAndWaitServiceStatus(false);
+                                SetAndWaitServiceStatus(false);
+                            }
                         }
                     }
 
@@ -195,6 +217,11 @@ public void Process()
                         {
                             if (DS4Windows.Global.AutoProfileRevertDefaultProfile)
                             {
+                                if (Program.rootHub.TryDeferAutoProfileDefaultForGameBar(j))
+                                {
+                                    continue;
+                                }
+
                                 if (autoProfileDebugLogLevel > 0)
                                     DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. Unknown process. Reverting to default profile. Controller {j + 1}={Global.ProfilePath[j]} (default)", false, true);
 
@@ -250,6 +277,14 @@ private AutoProfileEntity SelectProfileEntityForController(List<AutoProfileEntit
             return fallbackEntity;
         }
 
+        private static bool IsGameBarForegroundWindow(string topProcessName, string topWndTitleName)
+        {
+            return topProcessName.IndexOf("gamebar", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                topProcessName.IndexOf("xboxgamingoverlay", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                topWndTitleName.IndexOf("game bar", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                topWndTitleName.IndexOf("xbox game bar", StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+
         private bool GetTopWindowName(out string topProcessName, out string topWndTitleName)
         {
             IntPtr hWnd = GetForegroundWindow();
diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 2d9c723..ddbcc1c 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -2653,6 +2653,139 @@ protected void On_DS4Removal(object sender, EventArgs e)
         private bool gameBarHasDiagnosticVisibleState = false;
         private bool gameBarAdminWarningLogged = false;
 
+        public bool IsGameBarProfilePriorityActive(int ind)
+        {
+            return ind >= 0 && ind < MAX_DS4_CONTROLLER_COUNT &&
+                (gameBarProfileActive[ind] || gameBarProfilePending[ind]);
+        }
+
+        public bool IsAnyGameBarProfilePriorityActive()
+        {
+            for (int i = 0; i < MAX_DS4_CONTROLLER_COUNT; i++)
+            {
+                if (IsGameBarProfilePriorityActive(i))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public bool TryDeferAutoProfileForGameBar(int ind, string profileName)
+        {
+            if (!IsGameBarProfilePriorityActive(ind))
+            {
+                return false;
+            }
+
+            bool changed = !gameBarPreviousUseTempProfile[ind] ||
+                gameBarPreviousTempProfileName[ind] != profileName;
+
+            gameBarPreviousUseTempProfile[ind] = true;
+            gameBarPreviousTempProfileName[ind] = profileName;
+            if (!string.IsNullOrEmpty(Global.ProfilePath[ind]))
+            {
+                gameBarPreviousProfileName[ind] = Global.ProfilePath[ind];
+            }
+
+            if (changed)
+            {
+                LogDebug($"Controller {ind + 1} deferred auto-profile '{profileName}' while Game Bar has priority.");
+            }
+
+            return true;
+        }
+
+        public bool TryDeferAutoProfileDefaultForGameBar(int ind)
+        {
+            if (!IsGameBarProfilePriorityActive(ind))
+            {
+                return false;
+            }
+
+            bool changed = gameBarPreviousUseTempProfile[ind] ||
+                !string.IsNullOrEmpty(gameBarPreviousTempProfileName[ind]);
+
+            gameBarPreviousUseTempProfile[ind] = false;
+            gameBarPreviousTempProfileName[ind] = string.Empty;
+            if (!string.IsNullOrEmpty(Global.ProfilePath[ind]))
+            {
+                gameBarPreviousProfileName[ind] = Global.ProfilePath[ind];
+            }
+
+            if (changed)
+            {
+                LogDebug($"Controller {ind + 1} deferred auto-profile default restore while Game Bar has priority.");
+            }
+
+            return true;
+        }
+
+        private bool HasAnyConfiguredGameBarProfile()
+        {
+            for (int i = 0; i < MAX_DS4_CONTROLLER_COUNT; i++)
+            {
+                if (DS4Controllers[i] != null &&
+                    Global.GameBarHomeButtonSupport[i] &&
+                    !string.IsNullOrEmpty(Global.GameBarProfileName[i]))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool TryGetConfiguredGameBarProfileName(int ind, out string profileName, bool logInvalid)
+        {
+            profileName = string.Empty;
+            if (!Global.GameBarHomeButtonSupport[ind])
+            {
+                return false;
+            }
+
+            profileName = Global.GameBarProfileName[ind];
+            if (string.IsNullOrEmpty(profileName))
+            {
+                if (logInvalid)
+                {
+                    LogDebug($"Game Bar Home button support is enabled for controller {ind + 1}, but no Game Bar profile is selected.", true);
+                }
+
+                return false;
+            }
+
+            string profilePath = Path.Combine(appdatapath, "Profiles", $"{profileName}.xml");
+            if (!File.Exists(profilePath))
+            {
+                if (logInvalid)
+                {
+                    LogDebug($"Game Bar profile '{profileName}' does not exist for controller {ind + 1}.", true);
+                }
+
+                return false;
+            }
+
+            return true;
+        }
+
+        private void RequestGameBarProfilePriority(int ind, string profileName, DateTime now, string reason)
+        {
+            if (IsGameBarProfilePriorityActive(ind))
+            {
+                return;
+            }
+
+            gameBarPreviousUseTempProfile[ind] = Global.useTempProfile[ind];
+            gameBarPreviousTempProfileName[ind] = Global.tempprofilename[ind];
+            gameBarPreviousProfileName[ind] = Global.ProfilePath[ind];
+            gameBarRequestedProfileName[ind] = profileName;
+            gameBarProfileRequestedUtc[ind] = now;
+            gameBarProfilePending[ind] = true;
+            LogDebug($"Controller {ind + 1} requested Game Bar profile '{profileName}' ({reason}). Waiting for Game Bar to become visible.");
+        }
+
         private void CheckGameBarHomeButton(int ind, DS4State cState, DS4State tempControlState, DS4State pState)
         {
             if (!cState.PS)
@@ -2682,22 +2815,8 @@ private void CheckGameBarHomeButton(int ind, DS4State cState, DS4State tempContr
                 return;
             }
 
-            if (!Global.GameBarHomeButtonSupport[ind])
-            {
-                return;
-            }
-
-            string profileName = Global.GameBarProfileName[ind];
-            if (string.IsNullOrEmpty(profileName))
-            {
-                LogDebug($"Game Bar Home button support is enabled for controller {ind + 1}, but no Game Bar profile is selected.", true);
-                return;
-            }
-
-            string profilePath = Path.Combine(appdatapath, "Profiles", $"{profileName}.xml");
-            if (!File.Exists(profilePath))
+            if (!TryGetConfiguredGameBarProfileName(ind, out string profileName, true))
             {
-                LogDebug($"Game Bar profile '{profileName}' does not exist for controller {ind + 1}.", true);
                 return;
             }
 
@@ -2710,30 +2829,17 @@ private void CheckGameBarHomeButton(int ind, DS4State cState, DS4State tempContr
             cState.PS = false;
             tempControlState.PS = false;
             gameBarHomeButtonIgnoreUntilUtc[ind] = now + TimeSpan.FromSeconds(1);
+            RequestGameBarProfilePriority(ind, profileName, now, "Home button request");
             LogDebug($"Game Bar open request: {gameBarIntegration.OpenGameBar()}");
-            gameBarPreviousUseTempProfile[ind] = Global.useTempProfile[ind];
-            gameBarPreviousTempProfileName[ind] = Global.tempprofilename[ind];
-            gameBarPreviousProfileName[ind] = Global.ProfilePath[ind];
-            gameBarRequestedProfileName[ind] = profileName;
-            gameBarProfileRequestedUtc[ind] = now;
-            gameBarProfilePending[ind] = true;
-            LogDebug($"Controller {ind + 1} requested Game Bar profile '{profileName}'. Waiting for Game Bar to become visible.");
             LogGameBarDiagnostics("Home button request");
         }
 
-        private void UpdateGameBarProfileState()
+        public void UpdateGameBarProfileState()
         {
-            bool anyActiveOrPending = false;
-            for (int i = 0; i < MAX_DS4_CONTROLLER_COUNT; i++)
-            {
-                if (gameBarProfileActive[i] || gameBarProfilePending[i])
-                {
-                    anyActiveOrPending = true;
-                    break;
-                }
-            }
+            bool anyActiveOrPending = IsAnyGameBarProfilePriorityActive();
+            bool anyConfigured = HasAnyConfiguredGameBarProfile();
 
-            if (!anyActiveOrPending)
+            if (!anyActiveOrPending && !anyConfigured)
             {
                 return;
             }
@@ -2751,6 +2857,7 @@ private void UpdateGameBarProfileState()
             {
                 gameBarLastVisibleUtc = now;
                 gameBarInvisibleSinceUtc = DateTime.MinValue;
+                RequestVisibleGameBarProfiles(now);
                 ActivatePendingGameBarProfiles(now);
                 return;
             }
@@ -2792,6 +2899,22 @@ private void UpdateGameBarProfileState()
             }
         }
 
+        private void RequestVisibleGameBarProfiles(DateTime now)
+        {
+            for (int i = 0; i < MAX_DS4_CONTROLLER_COUNT; i++)
+            {
+                if (DS4Controllers[i] == null || IsGameBarProfilePriorityActive(i))
+                {
+                    continue;
+                }
+
+                if (TryGetConfiguredGameBarProfileName(i, out string profileName, false))
+                {
+                    RequestGameBarProfilePriority(i, profileName, now, "Game Bar visible");
+                }
+            }
+        }
+
         private void ActivatePendingGameBarProfiles(DateTime now)
         {
             for (int i = 0; i < MAX_DS4_CONTROLLER_COUNT; i++)
diff --git a/DS4Windows/DS4Forms/MainWindow.xaml.cs b/DS4Windows/DS4Forms/MainWindow.xaml.cs
index 83c77cc..a79bca0 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml.cs
+++ b/DS4Windows/DS4Forms/MainWindow.xaml.cs
@@ -845,7 +845,9 @@ private void AutoProfilesTimer_Elapsed(object sender, System.Timers.ElapsedEvent
         {
             autoProfilesTimer.Stop();
             //Console.WriteLine("Event triggered");
+            App.rootHub.UpdateGameBarProfileState();
             autoprofileChecker.Process();
+            App.rootHub.UpdateGameBarProfileState();
 
             if (autoprofileChecker.Running)
             {

From d19d922cd36df6f8979fda3050e9524a7baad2c2 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sat, 6 Jun 2026 08:28:50 -0500
Subject: [PATCH 03/47] Quiet Game Bar profile logging

---
 DS4Windows/AutoProfileChecker.cs        | 21 ++-----
 DS4Windows/DS4Control/ControlService.cs | 83 +++----------------------
 2 files changed, 13 insertions(+), 91 deletions(-)

diff --git a/DS4Windows/AutoProfileChecker.cs b/DS4Windows/AutoProfileChecker.cs
index 24c14ce..1d2937c 100644
--- a/DS4Windows/AutoProfileChecker.cs
+++ b/DS4Windows/AutoProfileChecker.cs
@@ -70,9 +70,6 @@ public void Process()
                 if (Program.rootHub.IsAnyGameBarProfilePriorityActive() &&
                     IsGameBarForegroundWindow(topProcessName, topWindowTitle))
                 {
-                    if (autoProfileDebugLogLevel > 0)
-                        DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. Game Bar has priority; preserving underlying auto-profile while Game Bar is foreground", false, true);
-
                     return;
                 }
 
@@ -174,23 +171,15 @@ public void Process()
                         }
                     }
 
-                    if (turnOffDS4WinApp)
+                    if (turnOffDS4WinApp && !Program.rootHub.IsAnyGameBarProfilePriorityActive())
                     {
-                        if (Program.rootHub.IsAnyGameBarProfilePriorityActive())
+                        turnOffTemp = true;
+                        if (App.rootHub.running)
                         {
                             if (autoProfileDebugLogLevel > 0)
-                                DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. Turnoff rule deferred while Game Bar has priority", false, true);
-                        }
-                        else
-                        {
-                            turnOffTemp = true;
-                            if (App.rootHub.running)
-                            {
-                                if (autoProfileDebugLogLevel > 0)
-                                    DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. Turning DS4Windows temporarily off", false, true);
+                                DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. Turning DS4Windows temporarily off", false, true);
 
-                                SetAndWaitServiceStatus(false);
-                            }
+                            SetAndWaitServiceStatus(false);
                         }
                     }
 
diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index ddbcc1c..7623f2f 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -2648,10 +2648,6 @@ protected void On_DS4Removal(object sender, EventArgs e)
         private DateTime gameBarLastVisibleUtc = DateTime.MinValue;
         private DateTime gameBarInvisibleSinceUtc = DateTime.MinValue;
         private DateTime gameBarLastVisibilityCheckUtc = DateTime.MinValue;
-        private DateTime gameBarLastDiagnosticLogUtc = DateTime.MinValue;
-        private bool gameBarLastDiagnosticVisible = false;
-        private bool gameBarHasDiagnosticVisibleState = false;
-        private bool gameBarAdminWarningLogged = false;
 
         public bool IsGameBarProfilePriorityActive(int ind)
         {
@@ -2679,9 +2675,6 @@ public bool TryDeferAutoProfileForGameBar(int ind, string profileName)
                 return false;
             }
 
-            bool changed = !gameBarPreviousUseTempProfile[ind] ||
-                gameBarPreviousTempProfileName[ind] != profileName;
-
             gameBarPreviousUseTempProfile[ind] = true;
             gameBarPreviousTempProfileName[ind] = profileName;
             if (!string.IsNullOrEmpty(Global.ProfilePath[ind]))
@@ -2689,11 +2682,6 @@ public bool TryDeferAutoProfileForGameBar(int ind, string profileName)
                 gameBarPreviousProfileName[ind] = Global.ProfilePath[ind];
             }
 
-            if (changed)
-            {
-                LogDebug($"Controller {ind + 1} deferred auto-profile '{profileName}' while Game Bar has priority.");
-            }
-
             return true;
         }
 
@@ -2704,9 +2692,6 @@ public bool TryDeferAutoProfileDefaultForGameBar(int ind)
                 return false;
             }
 
-            bool changed = gameBarPreviousUseTempProfile[ind] ||
-                !string.IsNullOrEmpty(gameBarPreviousTempProfileName[ind]);
-
             gameBarPreviousUseTempProfile[ind] = false;
             gameBarPreviousTempProfileName[ind] = string.Empty;
             if (!string.IsNullOrEmpty(Global.ProfilePath[ind]))
@@ -2714,11 +2699,6 @@ public bool TryDeferAutoProfileDefaultForGameBar(int ind)
                 gameBarPreviousProfileName[ind] = Global.ProfilePath[ind];
             }
 
-            if (changed)
-            {
-                LogDebug($"Controller {ind + 1} deferred auto-profile default restore while Game Bar has priority.");
-            }
-
             return true;
         }
 
@@ -2737,7 +2717,7 @@ private bool HasAnyConfiguredGameBarProfile()
             return false;
         }
 
-        private bool TryGetConfiguredGameBarProfileName(int ind, out string profileName, bool logInvalid)
+        private bool TryGetConfiguredGameBarProfileName(int ind, out string profileName)
         {
             profileName = string.Empty;
             if (!Global.GameBarHomeButtonSupport[ind])
@@ -2748,29 +2728,19 @@ private bool TryGetConfiguredGameBarProfileName(int ind, out string profileName,
             profileName = Global.GameBarProfileName[ind];
             if (string.IsNullOrEmpty(profileName))
             {
-                if (logInvalid)
-                {
-                    LogDebug($"Game Bar Home button support is enabled for controller {ind + 1}, but no Game Bar profile is selected.", true);
-                }
-
                 return false;
             }
 
             string profilePath = Path.Combine(appdatapath, "Profiles", $"{profileName}.xml");
             if (!File.Exists(profilePath))
             {
-                if (logInvalid)
-                {
-                    LogDebug($"Game Bar profile '{profileName}' does not exist for controller {ind + 1}.", true);
-                }
-
                 return false;
             }
 
             return true;
         }
 
-        private void RequestGameBarProfilePriority(int ind, string profileName, DateTime now, string reason)
+        private void RequestGameBarProfilePriority(int ind, string profileName, DateTime now)
         {
             if (IsGameBarProfilePriorityActive(ind))
             {
@@ -2783,7 +2753,6 @@ private void RequestGameBarProfilePriority(int ind, string profileName, DateTime
             gameBarRequestedProfileName[ind] = profileName;
             gameBarProfileRequestedUtc[ind] = now;
             gameBarProfilePending[ind] = true;
-            LogDebug($"Controller {ind + 1} requested Game Bar profile '{profileName}' ({reason}). Waiting for Game Bar to become visible.");
         }
 
         private void CheckGameBarHomeButton(int ind, DS4State cState, DS4State tempControlState, DS4State pState)
@@ -2810,28 +2779,21 @@ private void CheckGameBarHomeButton(int ind, DS4State cState, DS4State tempContr
             {
                 cState.PS = false;
                 tempControlState.PS = false;
-                LogDebug($"Game Bar open request: {gameBarIntegration.OpenGameBar()}");
+                gameBarIntegration.OpenGameBar();
                 gameBarHomeButtonIgnoreUntilUtc[ind] = now + TimeSpan.FromSeconds(1);
                 return;
             }
 
-            if (!TryGetConfiguredGameBarProfileName(ind, out string profileName, true))
+            if (!TryGetConfiguredGameBarProfileName(ind, out string profileName))
             {
                 return;
             }
 
-            if (!gameBarIntegration.IsRunningElevated() && !gameBarAdminWarningLogged)
-            {
-                LogDebug("Game Bar support needs DS4Windows to be run as administrator to reliably detect Game Bar overlay windows.", true);
-                gameBarAdminWarningLogged = true;
-            }
-
             cState.PS = false;
             tempControlState.PS = false;
             gameBarHomeButtonIgnoreUntilUtc[ind] = now + TimeSpan.FromSeconds(1);
-            RequestGameBarProfilePriority(ind, profileName, now, "Home button request");
-            LogDebug($"Game Bar open request: {gameBarIntegration.OpenGameBar()}");
-            LogGameBarDiagnostics("Home button request");
+            RequestGameBarProfilePriority(ind, profileName, now);
+            gameBarIntegration.OpenGameBar();
         }
 
         public void UpdateGameBarProfileState()
@@ -2852,7 +2814,6 @@ public void UpdateGameBarProfileState()
 
             gameBarLastVisibilityCheckUtc = now;
             bool gameBarVisible = gameBarIntegration.IsGameBarVisible();
-            MaybeLogGameBarDiagnostics(now, gameBarVisible);
             if (gameBarVisible)
             {
                 gameBarLastVisibleUtc = now;
@@ -2872,7 +2833,6 @@ public void UpdateGameBarProfileState()
                 if (gameBarProfilePending[i] && now - gameBarProfileRequestedUtc[i] > TimeSpan.FromSeconds(6))
                 {
                     ClearPendingGameBarProfile(i);
-                    LogDebug($"Controller {i + 1} did not switch to Game Bar profile because Game Bar was not detected.", true);
                 }
 
                 if (!gameBarProfileActive[i])
@@ -2894,7 +2854,6 @@ public void UpdateGameBarProfileState()
                     gameBarPreviousTempProfileName[i] = string.Empty;
                     gameBarPreviousProfileName[i] = string.Empty;
                     gameBarRequestedProfileName[i] = string.Empty;
-                    LogDebug($"Controller {i + 1} reverted from Game Bar profile.");
                 }
             }
         }
@@ -2908,9 +2867,9 @@ private void RequestVisibleGameBarProfiles(DateTime now)
                     continue;
                 }
 
-                if (TryGetConfiguredGameBarProfileName(i, out string profileName, false))
+                if (TryGetConfiguredGameBarProfileName(i, out string profileName))
                 {
-                    RequestGameBarProfilePriority(i, profileName, now, "Game Bar visible");
+                    RequestGameBarProfilePriority(i, profileName, now);
                 }
             }
         }
@@ -2929,38 +2888,12 @@ private void ActivatePendingGameBarProfiles(DateTime now)
                 {
                     gameBarProfileActive[i] = true;
                     gameBarProfileActivatedUtc[i] = now;
-                    LogDebug($"Controller {i + 1} switched to Game Bar profile '{profileName}'.");
-                }
-                else
-                {
-                    LogDebug($"Controller {i + 1} could not load Game Bar profile '{profileName}'.", true);
                 }
 
                 ClearPendingGameBarProfile(i);
             }
         }
 
-        private void MaybeLogGameBarDiagnostics(DateTime now, bool gameBarVisible)
-        {
-            bool changed = !gameBarHasDiagnosticVisibleState || gameBarLastDiagnosticVisible != gameBarVisible;
-            bool intervalElapsed = now - gameBarLastDiagnosticLogUtc > TimeSpan.FromSeconds(10);
-
-            if (!changed && !intervalElapsed)
-            {
-                return;
-            }
-
-            gameBarLastDiagnosticVisible = gameBarVisible;
-            gameBarHasDiagnosticVisibleState = true;
-            gameBarLastDiagnosticLogUtc = now;
-            LogGameBarDiagnostics(changed ? $"Visibility changed to {gameBarVisible}" : $"Visibility still {gameBarVisible}");
-        }
-
-        private void LogGameBarDiagnostics(string reason)
-        {
-            LogDebug($"Game Bar diagnostics ({reason}):\n{gameBarIntegration.GetGameBarStateDiagnostics()}");
-        }
-
         private void ClearPendingGameBarProfile(int ind)
         {
             gameBarProfilePending[ind] = false;

From fda967930c0c66aa9d917ff5af9ccefa1cd68dc0 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sat, 6 Jun 2026 08:35:35 -0500
Subject: [PATCH 04/47] Update fork branding and release checks

---
 DS4Windows/App.xaml.cs                        |  2 +-
 DS4Windows/DS4Control/ScpUtil.cs              | 38 +++++++++++++----
 DS4Windows/DS4Forms/About.xaml                |  2 +-
 DS4Windows/DS4Forms/About.xaml.cs             |  6 +--
 .../DS4Forms/ViewModels/LogViewModel.cs       |  2 +-
 .../ViewModels/MainWindowsViewModel.cs        |  9 ++--
 .../DS4Forms/ViewModels/TrayIconViewModel.cs  |  2 +-
 DS4Windows/DS4WinWPF.csproj                   |  9 ++--
 README.md                                     | 42 ++++---------------
 9 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/DS4Windows/App.xaml.cs b/DS4Windows/App.xaml.cs
index 93bdbdd..0e13d69 100644
--- a/DS4Windows/App.xaml.cs
+++ b/DS4Windows/App.xaml.cs
@@ -181,7 +181,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
             DispatcherUnhandledException += App_DispatcherUnhandledException;
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             Logger logger = logHolder.Logger;
-            string version = DS4Windows.Global.exeversion;
+            string version = DS4Windows.Global.exeDisplayVersion;
             logger.Info($"DS4Windows version {version}");
             logger.Info($"DS4Windows exe file: {DS4Windows.Global.exeFileName}");
             logger.Info($"DS4Windows Assembly Architecture: {(Environment.Is64BitProcess ? "x64" : "x86")}");
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index 5f4fcca..a63d300 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -34,6 +34,7 @@ You should have received a copy of the GNU General Public License
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -558,6 +559,8 @@ public class Global
         public static string exeFileName = Path.GetFileName(exelocation);
         public static FileVersionInfo fileVersion = FileVersionInfo.GetVersionInfo(exelocation);
         public static string exeversion = fileVersion.FileVersion;
+        public static string exeDisplayVersion = string.IsNullOrWhiteSpace(fileVersion.ProductVersion) ?
+            exeversion : fileVersion.ProductVersion;
         public static ulong exeversionLong = (ulong)fileVersion.ProductMajorPart << 48 |
             (ulong)fileVersion.ProductMinorPart << 32 | (ulong)fileVersion.ProductBuildPart << 16;
         public static ulong fullExeVersionLong = exeversionLong | (ushort)fileVersion.ProductPrivatePart;
@@ -3366,12 +3369,21 @@ public static IEnumerable<DISPLAY_DEVICE> GrabCurrentMonitors()
 
     public class Changelog
     {
-        public const string GITHUB_RELEASES_API_URI = "https://api.github.com/repos/schmaldeo/DS4Windows/releases";
-        public const string GITHUB_LATEST_RELEASE_API_URI = "https://api.github.com/repos/schmaldeo/DS4Windows/releases/latest";
+        public const string GITHUB_RELEASES_API_URI = "https://api.github.com/repos/hbashton/DS4Windows/releases";
+        public const string GITHUB_LATEST_RELEASE_API_URI = "https://api.github.com/repos/hbashton/DS4Windows/releases/latest";
 
         private static bool? _newerVersionAvailable = null;
         private static Version _latestVersion;
 
+        public static bool TryParseReleaseVersion(string tagName, out Version version)
+        {
+            version = Version.Parse("0.0.0");
+            if (string.IsNullOrWhiteSpace(tagName)) return false;
+
+            Match versionMatch = Regex.Match(tagName, @"\d+(?:\.\d+){1,3}");
+            return versionMatch.Success && Version.TryParse(versionMatch.Value, out version);
+        }
+
         // Much more compact and elegant way of checking if there is a new update available than the
         // shenanigans with fetching newest.txt and using a .txt file as a DTO instead of simply
         // passing a string to the function that displays the updater window.
@@ -3390,15 +3402,20 @@ public static bool CheckNewerVersionExists(out Version version, bool allowCached
                 return (bool)_newerVersionAvailable;
             }
 
-            var request = App.requestClient.GetAsync(GITHUB_LATEST_RELEASE_API_URI);
+            var request = App.requestClient.GetAsync(GITHUB_RELEASES_API_URI);
             request.Wait();
             if (request.Result.IsSuccessStatusCode)
             {
-                var task = request.Result.Content.ReadFromJsonAsync<GithubRelease>();
+                var task = request.Result.Content.ReadFromJsonAsync<GithubRelease[]>();
                 task.Wait();
 
-                // if can't parse the newest version
-                if (!Version.TryParse(task.Result.TagName[1..], out version)) return false;
+                foreach (var release in task.Result ?? Array.Empty<GithubRelease>())
+                {
+                    if (!TryParseReleaseVersion(release.TagName, out var parsedVersion)) continue;
+                    if (parsedVersion > version) version = parsedVersion;
+                }
+
+                if (version <= Version.Parse("0.0.0")) return false;
 
                 // if there is a newer version available
                 if (currentVersion < version)
@@ -3423,15 +3440,18 @@ public static async Task<Dictionary<Version, string>> GetChangelog(bool allVersi
             if (!Version.TryParse(Global.exeversion, out var currentVersion)) return dict;
 
             var request = await App.requestClient.GetAsync(GITHUB_RELEASES_API_URI);
+            if (!request.IsSuccessStatusCode) return dict;
+
             var releases = await request.Content.ReadFromJsonAsync<GithubRelease[]>();
+            if (releases is null) return dict;
 
             foreach (var release in releases)
             {
-                if (release.PreRelease) continue;
-
-                if (!Version.TryParse(release.TagName[1..], out var parsedVersion)) continue;
+                if (!TryParseReleaseVersion(release.TagName, out var parsedVersion)) continue;
 
                 if (!allVersions && parsedVersion <= currentVersion) break;
+                if (dict.ContainsKey(parsedVersion)) continue;
+
                 dict.Add(parsedVersion, release.Body);
             }
 
diff --git a/DS4Windows/DS4Forms/About.xaml b/DS4Windows/DS4Forms/About.xaml
index ed6484a..acc5b7f 100644
--- a/DS4Windows/DS4Forms/About.xaml
+++ b/DS4Windows/DS4Forms/About.xaml
@@ -9,7 +9,7 @@
         Title="{lex:LocExtension HotkeysAbout}" Height="450" Width="800"
         Style="{DynamicResource WindowStyle}">
     <DockPanel>
-        <Label x:Name="headerLb" Content="DS4Windows - schmaldeo Build (Version " DockPanel.Dock="Top" HorizontalAlignment="Center" />
+        <Label x:Name="headerLb" Content="DS4Windows - hbashton Build (Version " DockPanel.Dock="Top" HorizontalAlignment="Center" />
 
         <TabControl>
             <TabItem Header="Hotkeys">
diff --git a/DS4Windows/DS4Forms/About.xaml.cs b/DS4Windows/DS4Forms/About.xaml.cs
index 44dbe67..b8f6cb9 100644
--- a/DS4Windows/DS4Forms/About.xaml.cs
+++ b/DS4Windows/DS4Forms/About.xaml.cs
@@ -30,7 +30,7 @@ public About()
         {
             InitializeComponent();
 
-            string version = $"{Global.exeversion})";
+            string version = $"{Global.exeDisplayVersion})";
             headerLb.Content += version;
         }
 
@@ -42,7 +42,7 @@ private void SiteLink_Click(object sender, RoutedEventArgs e)
 
         private void SourceLink_Click(object sender, RoutedEventArgs e)
         {
-            Util.StartProcessHelper("https://github.com/schmaldeo/DS4Windows");
+            Util.StartProcessHelper("https://github.com/hbashton/DS4Windows");
         }
 
         private void Ryochan7Link_Click(object sender, RoutedEventArgs e)
@@ -102,7 +102,7 @@ private void VJoyInterfaceLink_Click(object sender, RoutedEventArgs e)
 
         private void ContributorsLink_OnClick(object sender, RoutedEventArgs e)
         {
-            Util.StartProcessHelper("https://github.com/schmaldeo/DS4Windows/blob/master/contributors.txt");
+            Util.StartProcessHelper("https://github.com/hbashton/DS4Windows/blob/main/contributors.txt");
         }
     }
 }
diff --git a/DS4Windows/DS4Forms/ViewModels/LogViewModel.cs b/DS4Windows/DS4Forms/ViewModels/LogViewModel.cs
index ab00354..0fd8508 100644
--- a/DS4Windows/DS4Forms/ViewModels/LogViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/LogViewModel.cs
@@ -37,7 +37,7 @@ public class LogViewModel
 
         public LogViewModel(DS4Windows.ControlService service)
         {
-            string version = DS4Windows.Global.exeversion;
+            string version = DS4Windows.Global.exeDisplayVersion;
             logItems.Add(new LogItem { Datetime = DateTime.Now, Message = $"DS4Windows version {version}" });
             logItems.Add(new LogItem { Datetime = DateTime.Now, Message = $"DS4Windows Assembly Architecture: {(Environment.Is64BitProcess ? "x64" : "x86")}" });
             logItems.Add(new LogItem { Datetime = DateTime.Now, Message = $"OS Version: {Environment.OSVersion}" });
diff --git a/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs b/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs
index 77d0b39..bb84b12 100644
--- a/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs
@@ -103,8 +103,7 @@ public bool RunUpdaterCheck(bool launch, out string upstreamVersion)
 
         public void DownloadUpstreamVersionInfo()
         {
-            // Sorry other devs, gonna have to find your own server
-            Uri url = new Uri("https://api.github.com/repos/schmaldeo/DS4Windows/releases/latest");
+            Uri url = new Uri("https://api.github.com/repos/hbashton/DS4Windows/releases/latest");
             string filename = Global.appdatapath + "\\version.txt";
             bool success = false;
             using (StreamWriter streamWriter = new(filename, false))
@@ -117,9 +116,11 @@ public void DownloadUpstreamVersionInfo()
                     {
                         var gitHubReleaseTask = requestTask.Result.Content.ReadFromJsonAsync<GithubRelease>();
                         gitHubReleaseTask.Wait();
-                        if (!gitHubReleaseTask.IsFaulted)
+                        if (!gitHubReleaseTask.IsFaulted &&
+                            gitHubReleaseTask.Result is not null &&
+                            Changelog.TryParseReleaseVersion(gitHubReleaseTask.Result.TagName, out var releaseVersion))
                         {
-                            streamWriter.Write(gitHubReleaseTask.Result.TagName.Substring(1));
+                            streamWriter.Write(releaseVersion);
                             success = true;
                         }
                     }
diff --git a/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs b/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
index 04ac277..bd17e6f 100644
--- a/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
@@ -32,7 +32,7 @@ public class TrayIconViewModel
         private string tooltipText = "DS4Windows";
         private string iconSource;
         public const string ballonTitle = "DS4Windows";
-        public static string trayTitle = $"DS4Windows v{Global.exeversion}";
+        public static string trayTitle = $"DS4Windows v{Global.exeDisplayVersion}";
         private ContextMenu contextMenu;
         private MenuItem changeServiceItem;
         private MenuItem openItem;
diff --git a/DS4Windows/DS4WinWPF.csproj b/DS4Windows/DS4WinWPF.csproj
index b555607..d1df3e6 100644
--- a/DS4Windows/DS4WinWPF.csproj
+++ b/DS4Windows/DS4WinWPF.csproj
@@ -18,15 +18,16 @@
 		<AssemblyVersion>3.9.9</AssemblyVersion>
 		<FileVersion>3.9.9</FileVersion>
 		<Version>3.9.9</Version>
+		<InformationalVersion>3.9.9Beta</InformationalVersion>
 		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
 		<Copyright>Copyright © Scarlet.Crush Productions 2012, 2013; InhexSTER, HecticSeptic, electrobrains 2013, 2014; Jays2Kings 2013, 2014, 2015, 2016; Ryochan7 2017-2023, schmaldeo 2024</Copyright>
 		<Description>Sony DualShock 4 to Microsoft Xinput controller mapper</Description>
-		<Authors>schmaldeo</Authors>
-		<Company>schmaldeo</Company>
-		<PackageProjectUrl>https://schmaldeo.github.io/DS4WindowsDocs</PackageProjectUrl>
+		<Authors>hbashton</Authors>
+		<Company>hbashton</Company>
+		<PackageProjectUrl>https://github.com/hbashton/DS4Windows</PackageProjectUrl>
 		<PackageLicenseUrl>https://www.gnu.org/licenses/gpl-3.0.txt</PackageLicenseUrl>
-		<RepositoryUrl>https://github.com/schmaldeo/DS4Windows</RepositoryUrl>
+		<RepositoryUrl>https://github.com/hbashton/DS4Windows</RepositoryUrl>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/README.md b/README.md
index 8b870ec..8d9fe6c 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,9 @@
-# DISCONTINUATION
-
-**I'm sad to announce that I will be discontinuing any further work on this project.**
-
-I initially wanted to take a short break and come back to the project, 
-however with 1) lack of time for development due to both work and personal life and 2) the development of machine learning technologies I'm just not willing
-to put any more work into it. Especially the 2nd point made me completely lose interest in it. 
-
-Open source software, something I once valued way more than
-proprietary software, has now become a clown show due to so-called _vibe coders_. People's contributions to OSS were once a great learning experience, GitHub 
-used to be a place where you could exchange knowledge and build a nice resume as well as find many fantastic hobby projects you could make use of. 
-I've learnt that myself. Now, seeing many OSS projects receive many completely trash and meaningless pull requests and GitHub being flooded with very 
-low quality or straight up vulnerable on all fronts code, I lost my faith in it. 
-
-My goal with this project was producing good (for obvious reasons not perfect, but still goot) quality code and delivering what people wanted. 
-**To learn and become a better software engineer.** All the motivation I had to do that is completely gone now.
-
-Thank you for all the contributors, people who helped me develop it and people who reported bugs and feature requests.
-
-It was a good ride.
-
-Maybe one day we will come back to the way the things were before.
-
-## DS4Windows
+# DS4Windows
 
 Like those other DS4 tools, but sexier.
 
+This fork is an alternative to Schmaldeo's DS4Windows now that his work on that project has been discontinued.
+
 DS4Windows is an extract anywhere program that allows you to get the best
 DualShock 4 experience on your PC. By emulating an Xbox 360 controller, many
 more games are accessible. Other input controllers are also supported including the
@@ -38,12 +17,9 @@ for DS3 based on accelerometer value (which is a work of [sunnyqeen](https://git
 
 ## About this fork
 
-I've made this fork because some of the buttons on my controller started bouncing. Normally I would just add a
-feature that would fix my problem, make a pull request to the original repo and forget about the project. 
-The issue here is that Ryochan7 stopped maintaining the original project, so I decided to make slight 
-modifications to the code that detects if the installed version is up-to-date, so it now pulls version info from my 
-repo. This way if you install my version, you don't get the annoying popup saying your version is outdated. If there 
-are any feature requests, I'm more than happy to at least look at them and assess whether I could add them.
+This repository continues DS4Windows as a user-focused alternative to Schmaldeo's discontinued fork. It builds on
+the work of Jays2Kings, Ryochan7, Schmaldeo, and other contributors while keeping release checks and downloads tied
+to this maintained branch.
 
 ## License
 
@@ -54,15 +30,15 @@ available in this source code from the COPYING file.
 
 ## Downloads
 
-- **[Main builds of DS4Windows](https://github.com/schmaldeo/DS4Windows/releases)**
+- **[Main builds of DS4Windows](https://github.com/hbashton/DS4Windows/releases)**
 
 ## Install
 
-You can install DS4Windows by downloading it from [releases](https://github.com/schmaldeo/DS4Windows/releases) and place it to your preferred place.
+You can install DS4Windows by downloading it from [releases](https://github.com/hbashton/DS4Windows/releases) and place it to your preferred place.
 
 Alternatively, you can install [`ds4windows`](https://scoop.sh/#/apps?q=ds4windows&o=true&id=c8b519fcb06da6bb014569fd0a07521839ec5425) via [Scoop](https://scoop.sh/).
 
-Alternatively, you can download [`ds4w.bat`](https://raw.githubusercontent.com/schmaldeo/DS4Windows/refs/heads/master/ds4w.bat) file and execute it. It will open a window that downloads and places the program in `%LOCALAPPDATA%\DS4Windows` and creates a desktop shortcut to the executable.
+Alternatively, you can download [`ds4w.bat`](https://raw.githubusercontent.com/hbashton/DS4Windows/refs/heads/main/ds4w.bat) file and execute it. It will open a window that downloads and places the program in `%LOCALAPPDATA%\DS4Windows` and creates a desktop shortcut to the executable.
 
 ## Requirements
 

From aa516b983329ab3f492dfb47e188b9bec34da4d1 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sat, 6 Jun 2026 08:46:19 -0500
Subject: [PATCH 05/47] Use hbashton DS4Updater releases

---
 DS4Windows/DS4Forms/MainWindow.xaml.cs              |  4 ++--
 .../DS4Forms/ViewModels/MainWindowsViewModel.cs     | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/DS4Windows/DS4Forms/MainWindow.xaml.cs b/DS4Windows/DS4Forms/MainWindow.xaml.cs
index a79bca0..ef6ec6f 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml.cs
+++ b/DS4Windows/DS4Forms/MainWindow.xaml.cs
@@ -274,7 +274,7 @@ private void DisplayUpdaterWindow(string version)
                         if (!string.IsNullOrEmpty(newUpdaterVersion))
                         {
                             Util.StartProcessHelper(
-                                $"https://github.com/schmaldeo/DS4Updater/releases/tag/v{newUpdaterVersion}/{mainWinVM.updaterExe}");
+                                $"https://github.com/hbashton/DS4Updater/releases/tag/v{newUpdaterVersion}");
                         }
                     });
                 }
@@ -336,7 +336,7 @@ private void Check_Version(bool showstatus = false)
                             MessageBox.Show(Properties.Resources.PleaseDownloadUpdater);
                             if (!string.IsNullOrEmpty(newUpdaterVersion))
                             {
-                                Util.StartProcessHelper($"https://github.com/schmaldeo/DS4Updater/releases/tag/v{newUpdaterVersion}/{mainWinVM.updaterExe}");
+                                Util.StartProcessHelper($"https://github.com/hbashton/DS4Updater/releases/tag/v{newUpdaterVersion}");
                             }
                         });
                     }
diff --git a/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs b/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs
index bb84b12..76afb49 100644
--- a/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs
@@ -47,8 +47,7 @@ public bool FullTabsEnabled
 
         private string DownloadUpstreamUpdaterVersion()
         {
-            // Sorry other devs, gonna have to find your own server
-            Uri url = new Uri("https://api.github.com/repos/schmaldeo/DS4Updater/releases/latest");
+            Uri url = new Uri("https://api.github.com/repos/hbashton/DS4Updater/releases/latest");
 
             Task<System.Net.Http.HttpResponseMessage> requestTask = App.requestClient.GetAsync(url.ToString());
             requestTask.Wait();
@@ -56,9 +55,11 @@ private string DownloadUpstreamUpdaterVersion()
             {
                 var gitHubReleaseTask = requestTask.Result.Content.ReadFromJsonAsync<GithubRelease>();
                 gitHubReleaseTask.Wait();
-                if (!gitHubReleaseTask.IsFaulted)
+                if (!gitHubReleaseTask.IsFaulted &&
+                    gitHubReleaseTask.Result is not null &&
+                    Changelog.TryParseReleaseVersion(gitHubReleaseTask.Result.TagName, out var updaterVersion))
                 {
-                    return gitHubReleaseTask.Result.TagName.Substring(1);
+                    return updaterVersion.ToString();
                 }
             }
             return string.Empty;
@@ -69,11 +70,13 @@ public bool RunUpdaterCheck(bool launch, out string upstreamVersion)
             string destPath = Path.Combine(Global.exedirpath, "DS4Updater.exe");
             bool updaterExists = File.Exists(destPath);
             upstreamVersion = DownloadUpstreamUpdaterVersion();
+            if (string.IsNullOrEmpty(upstreamVersion)) return false;
+
             if (!updaterExists ||
                 (!string.IsNullOrEmpty(upstreamVersion) && FileVersionInfo.GetVersionInfo(destPath).FileVersion.CompareTo(upstreamVersion) != 0))
             {
                 launch = false;
-                Uri url2 = new Uri($"https://github.com/schmaldeo/DS4Updater/releases/download/v{upstreamVersion}/{updaterExe}");
+                Uri url2 = new Uri($"https://github.com/hbashton/DS4Updater/releases/download/v{upstreamVersion}/{updaterExe}");
                 string filename = Path.Combine(Path.GetTempPath(), "DS4Updater.exe");
                 using (var downloadStream = new FileStream(filename, FileMode.Create))
                 {

From 2b8b9fbff24d2475b68ba74c545355c46d147ee0 Mon Sep 17 00:00:00 2001
From: Hunter Ashton <hbashton13@gmail.com>
Date: Sat, 6 Jun 2026 09:07:48 -0500
Subject: [PATCH 06/47] Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 8d9fe6c..7d23cf6 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,6 @@ available in this source code from the COPYING file.
 
 You can install DS4Windows by downloading it from [releases](https://github.com/hbashton/DS4Windows/releases) and place it to your preferred place.
 
-Alternatively, you can install [`ds4windows`](https://scoop.sh/#/apps?q=ds4windows&o=true&id=c8b519fcb06da6bb014569fd0a07521839ec5425) via [Scoop](https://scoop.sh/).
-
 Alternatively, you can download [`ds4w.bat`](https://raw.githubusercontent.com/hbashton/DS4Windows/refs/heads/main/ds4w.bat) file and execute it. It will open a window that downloads and places the program in `%LOCALAPPDATA%\DS4Windows` and creates a desktop shortcut to the executable.
 
 ## Requirements

From 77f747383ff79d96bc696bee0eecc490bf551c6c Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sat, 6 Jun 2026 09:11:25 -0500
Subject: [PATCH 07/47] Prepare DS4Windows 4.0.0 release

---
 .github/workflows/release.yml | 6 +++---
 DS4Windows/DS4WinWPF.csproj   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e12759b..3891009 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
         echo "SHORT_VERSION=${VERSION%-*}" >> $GITHUB_ENV
       shell: bash
     - name: Build X64
-      run: dotnet publish .\DS4Windows\DS4WinWPF.csproj -c Release  /p:platform=x64 /p:AssemblyVersion=${{ env.SHORT_VERSION }} /p:FileVersion=${{ env.SHORT_VERSION }} /p:Version=${{ env.VERSION }} -o .\bin\x64\Release\output
+      run: dotnet publish .\DS4Windows\DS4WinWPF.csproj -c Release  /p:platform=x64 /p:AssemblyVersion=${{ env.SHORT_VERSION }} /p:FileVersion=${{ env.SHORT_VERSION }} /p:Version=${{ env.VERSION }} /p:InformationalVersion=${{ env.VERSION }} -o .\bin\x64\Release\output
     - name: Post-Build script X64
       run: python .\utils\post-build.py .\bin\x64\Release\output . ${{env.VERSION}}
     - name: Publish release Build X64
@@ -43,10 +43,10 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ github.TOKEN }}
     - name: Build X86
-      run: dotnet publish .\DS4Windows\DS4WinWPF.csproj -c Release  /p:platform=x86 /p:AssemblyVersion=${{ env.SHORT_VERSION }} /p:FileVersion=${{ env.SHORT_VERSION }} /p:Version=${{ env.VERSION }} -o .\bin\x86\Release\output
+      run: dotnet publish .\DS4Windows\DS4WinWPF.csproj -c Release  /p:platform=x86 /p:AssemblyVersion=${{ env.SHORT_VERSION }} /p:FileVersion=${{ env.SHORT_VERSION }} /p:Version=${{ env.VERSION }} /p:InformationalVersion=${{ env.VERSION }} -o .\bin\x86\Release\output
     - name: Post-Build script X86
       run: python .\utils\post-build.py .\bin\x86\Release\output . ${{env.VERSION}}
     - name: Publish release Build X86
       run: gh release upload ${{github.event.release.tag_name}} .\bin\x86\Release\DS4Windows_${{env.VERSION}}_x86.zip
       env:
-        GITHUB_TOKEN: ${{ github.TOKEN }}
\ No newline at end of file
+        GITHUB_TOKEN: ${{ github.TOKEN }}
diff --git a/DS4Windows/DS4WinWPF.csproj b/DS4Windows/DS4WinWPF.csproj
index d1df3e6..78178ec 100644
--- a/DS4Windows/DS4WinWPF.csproj
+++ b/DS4Windows/DS4WinWPF.csproj
@@ -15,10 +15,10 @@
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
 		<EnableNETAnalyzers>false</EnableNETAnalyzers>
 		<ServerGarbageCollection>true</ServerGarbageCollection>
-		<AssemblyVersion>3.9.9</AssemblyVersion>
-		<FileVersion>3.9.9</FileVersion>
-		<Version>3.9.9</Version>
-		<InformationalVersion>3.9.9Beta</InformationalVersion>
+		<AssemblyVersion>4.0.0</AssemblyVersion>
+		<FileVersion>4.0.0</FileVersion>
+		<Version>4.0.0</Version>
+		<InformationalVersion>4.0.0</InformationalVersion>
 		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
 		<Copyright>Copyright © Scarlet.Crush Productions 2012, 2013; InhexSTER, HecticSeptic, electrobrains 2013, 2014; Jays2Kings 2013, 2014, 2015, 2016; Ryochan7 2017-2023, schmaldeo 2024</Copyright>

From da56754a07c100407a1438887fafaecfafa239da Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sat, 6 Jun 2026 09:33:56 -0500
Subject: [PATCH 08/47] Upload CI builds as DS4Windows folder artifacts

---
 .github/workflows/ci-build.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index e6fd556..e67003d 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -77,12 +77,19 @@ jobs:
       - name: Package ${{ matrix.platform }}
         run: python .\utils\post-build.py .\bin\${{ matrix.platform }}\Release\output . ${{ env.VERSION }}
 
+      - name: Stage ${{ matrix.platform }} artifact folder
+        shell: pwsh
+        run: |
+          $artifactRoot = ".\bin\${{ matrix.platform }}\Release\artifact"
+          New-Item -ItemType Directory -Path $artifactRoot -Force | Out-Null
+          Copy-Item -Path ".\bin\${{ matrix.platform }}\Release\DS4Windows" -Destination $artifactRoot -Recurse -Force
+
       - name: Upload ${{ matrix.platform }} artifact
         id: upload
         uses: actions/upload-artifact@v4
         with:
-          name: DS4Windows-${{ matrix.platform }}
-          path: .\bin\${{ matrix.platform }}\Release\DS4Windows_${{ env.VERSION }}_${{ matrix.platform }}.zip
+          name: DS4Windows_${{ env.VERSION }}_${{ matrix.platform }}
+          path: .\bin\${{ matrix.platform }}\Release\artifact
           if-no-files-found: error
 
       - name: Publish artifact link to run summary
@@ -92,5 +99,5 @@ jobs:
           echo "" >> "$GITHUB_STEP_SUMMARY"
           echo "Version: \`${{ env.VERSION }}\`" >> "$GITHUB_STEP_SUMMARY"
           echo "" >> "$GITHUB_STEP_SUMMARY"
-          echo "[Download DS4Windows-${{ matrix.platform }} (zip)](${{ steps.upload.outputs.artifact-url }})" >> "$GITHUB_STEP_SUMMARY"
+          echo "[Download DS4Windows_${{ env.VERSION }}_${{ matrix.platform }} (contains DS4Windows folder)](${{ steps.upload.outputs.artifact-url }})" >> "$GITHUB_STEP_SUMMARY"
 

From 9f3351f877c9fe84d03f67f39237a02da748f85b Mon Sep 17 00:00:00 2001
From: Cameron Beeley <cameron.beeley@gmail.com>
Date: Sun, 26 Apr 2026 02:55:04 +0100
Subject: [PATCH 09/47] fix: preserve interrupt pipe for copycat controllers
 over BT

Copycat (third-party clone) DS4 controllers may not properly support
HidD_SetOutputReport on the control pipe. Keep the interrupt pipe for
devices flagged as copycats via the IsCopyCat device option, while
using the reliable control pipe for genuine DS4 controllers.

(cherry picked from commit 52be18bec68b78d15f81b3967bdcef20116f7873)
---
 DS4Windows/DS4Library/DS4Device.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/DS4Windows/DS4Library/DS4Device.cs b/DS4Windows/DS4Library/DS4Device.cs
index 6ff7ae1..e92db9e 100644
--- a/DS4Windows/DS4Library/DS4Device.cs
+++ b/DS4Windows/DS4Library/DS4Device.cs
@@ -927,11 +927,10 @@ protected bool WriteOutput(byte[] outputBuffer)
         {
             if (conType == ConnectionType.BT)
             {
-                //if ((this.featureSet & VidPidFeatureSet.OnlyOutputData0x05) == 0)
-                //    return hDevice.WriteOutputReportViaControl(outputReport);
+                if (nativeOptionsStore != null && nativeOptionsStore.IsCopyCat)
+                    return hDevice.WriteOutputReportViaInterrupt(outputBuffer, READ_STREAM_TIMEOUT);
 
-                // Use Interrupt endpoint for BT DS4 connected devices now
-                return hDevice.WriteOutputReportViaInterrupt(outputBuffer, READ_STREAM_TIMEOUT);
+                return hDevice.WriteOutputReportViaControl(outputBuffer);
             }
             else
             {
@@ -943,11 +942,10 @@ protected bool writeOutput()
         {
             if (conType == ConnectionType.BT)
             {
-                //if ((this.featureSet & VidPidFeatureSet.OnlyOutputData0x05) == 0)
-                //    return hDevice.WriteOutputReportViaControl(outputReport);
+                if (nativeOptionsStore != null && nativeOptionsStore.IsCopyCat)
+                    return hDevice.WriteOutputReportViaInterrupt(outputReport, READ_STREAM_TIMEOUT);
 
-                // Use Interrupt endpoint for almost BT DS4 connected devices now
-                return hDevice.WriteOutputReportViaInterrupt(outputReport, READ_STREAM_TIMEOUT);
+                return hDevice.WriteOutputReportViaControl(outputReport);
             }
             else
             {

From 5cf4ecf94237a58e4a9f450d4d51d6e5188777d7 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sat, 6 Jun 2026 10:23:53 -0500
Subject: [PATCH 10/47] Bump version and simplify tray tooltip

---
 .../DS4Forms/ViewModels/TrayIconViewModel.cs  | 20 +++----------------
 DS4Windows/DS4WinWPF.csproj                   |  9 +++++----
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs b/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
index bd17e6f..998d827 100644
--- a/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
@@ -32,7 +32,7 @@ public class TrayIconViewModel
         private string tooltipText = "DS4Windows";
         private string iconSource;
         public const string ballonTitle = "DS4Windows";
-        public static string trayTitle = $"DS4Windows v{Global.exeDisplayVersion}";
+        public const string trayTitle = "DS4Windows";
         private ContextMenu contextMenu;
         private MenuItem changeServiceItem;
         private MenuItem openItem;
@@ -325,21 +325,7 @@ private void StartPopulateText(object sender, EventArgs e)
 
         private void PopulateToolText()
         {
-            List<string> items = new List<string>();
-            items.Add(trayTitle);
-            //IEnumerable<DS4Device> devices = DS4Devices.getDS4Controllers();
-            int idx = 1;
-            //foreach (DS4Device currentDev in devices)
-            _colLocker.EnterReadLock();
-            foreach (ControllerHolder holder in controllerList)
-            {
-                DS4Device currentDev = holder.Device;
-                items.Add($"{idx}: {currentDev.ConnectionType} {currentDev.Battery}%{(currentDev.Charging ? "+" : "")}");
-                idx++;
-            }
-            _colLocker.ExitReadLock();
-
-            TooltipText = string.Join("\n", items);
+            TooltipText = trayTitle;
         }
 
         private void SetupEvents()
@@ -416,7 +402,7 @@ private void ClearToolText(object sender, EventArgs e)
         {
             Application.Current.Dispatcher.BeginInvoke(() =>
             {
-                TooltipText = "DS4Windows";
+                TooltipText = trayTitle;
             });
             //contextMenu.Items.Clear();
         }
diff --git a/DS4Windows/DS4WinWPF.csproj b/DS4Windows/DS4WinWPF.csproj
index 78178ec..8b6d345 100644
--- a/DS4Windows/DS4WinWPF.csproj
+++ b/DS4Windows/DS4WinWPF.csproj
@@ -15,10 +15,11 @@
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
 		<EnableNETAnalyzers>false</EnableNETAnalyzers>
 		<ServerGarbageCollection>true</ServerGarbageCollection>
-		<AssemblyVersion>4.0.0</AssemblyVersion>
-		<FileVersion>4.0.0</FileVersion>
-		<Version>4.0.0</Version>
-		<InformationalVersion>4.0.0</InformationalVersion>
+		<AssemblyVersion>4.0.1</AssemblyVersion>
+		<FileVersion>4.0.1</FileVersion>
+		<Version>4.0.1</Version>
+		<InformationalVersion>4.0.1</InformationalVersion>
+		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
 		<Copyright>Copyright © Scarlet.Crush Productions 2012, 2013; InhexSTER, HecticSeptic, electrobrains 2013, 2014; Jays2Kings 2013, 2014, 2015, 2016; Ryochan7 2017-2023, schmaldeo 2024</Copyright>

From e8db7b60110660013b6af49e88259a8af9987dfb Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 7 Jun 2026 11:56:28 -0500
Subject: [PATCH 11/47] Fix duplicate auto-profile crash handling

---
 DS4Windows/AutoProfileChecker.cs              |  3 +-
 DS4Windows/AutoProfileHolder.cs               | 44 ++++++++++++++++++-
 .../DS4Control/DTOXml/AutoProfilesDTO.cs      |  1 +
 .../ViewModels/AutoProfilesViewModel.cs       | 34 ++++++++++----
 4 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/DS4Windows/AutoProfileChecker.cs b/DS4Windows/AutoProfileChecker.cs
index 1d2937c..ce37257 100644
--- a/DS4Windows/AutoProfileChecker.cs
+++ b/DS4Windows/AutoProfileChecker.cs
@@ -124,8 +124,7 @@ public void Process()
                             continue;
                         }
 
-                        string tempname = controllerProfileEntity.ApplyToAllControllers ?
-                            controllerProfileEntity.ProfileNames[0] : controllerProfileEntity.ProfileNames[j];
+                        string tempname = controllerProfileEntity.GetProfileNameForController(j);
                         if (tempname != string.Empty && tempname != "(none)")
                         {
                             if (Program.rootHub.TryDeferAutoProfileForGameBar(j, tempname))
diff --git a/DS4Windows/AutoProfileHolder.cs b/DS4Windows/AutoProfileHolder.cs
index 5afc7cd..2951060 100644
--- a/DS4Windows/AutoProfileHolder.cs
+++ b/DS4Windows/AutoProfileHolder.cs
@@ -152,7 +152,15 @@ public class AutoProfileEntity
         public bool Turnoff { get => turnoff; set => turnoff = value; }
         public AutoProfileDeviceOption DeviceOption { get => deviceOption; set => deviceOption = value; }
         public bool ApplyToAllControllers { get => applyToAllControllers; set => applyToAllControllers = value; }
-        public string[] ProfileNames { get => profileNames; set => profileNames = value; }
+        public string[] ProfileNames
+        {
+            get
+            {
+                EnsureProfileNames();
+                return profileNames;
+            }
+            set => profileNames = NormalizeProfileNames(value);
+        }
 
         public AutoProfileEntity(string pathStr, string titleStr)
         {
@@ -197,6 +205,40 @@ public bool IsMatch(string searchPath, string searchTitle)
             return bPathMatched && bTitleMwatched;
         }
 
+        public string GetProfileNameForController(int controllerIndex)
+        {
+            EnsureProfileNames();
+            int profileIndex = ApplyToAllControllers ? 0 : controllerIndex;
+            if (profileIndex < 0 || profileIndex >= profileNames.Length)
+            {
+                return NONE_STRING;
+            }
+
+            return NormalizeProfileName(profileNames[profileIndex]);
+        }
+
+        public void EnsureProfileNames()
+        {
+            profileNames = NormalizeProfileNames(profileNames);
+        }
+
+        private static string[] NormalizeProfileNames(string[] source)
+        {
+            string[] result = new string[DS4Windows.Global.MAX_DS4_CONTROLLER_COUNT];
+            for (int i = 0; i < result.Length; i++)
+            {
+                result[i] = i < (source?.Length ?? 0) ?
+                    NormalizeProfileName(source[i]) : string.Empty;
+            }
+
+            return result;
+        }
+
+        private static string NormalizeProfileName(string profileName)
+        {
+            return profileName ?? string.Empty;
+        }
+
         public bool IsDeviceMatch(DS4Windows.InputDevices.InputDeviceType deviceType)
         {
             switch (deviceOption)
diff --git a/DS4Windows/DS4Control/DTOXml/AutoProfilesDTO.cs b/DS4Windows/DS4Control/DTOXml/AutoProfilesDTO.cs
index 34f54a7..191e4e0 100644
--- a/DS4Windows/DS4Control/DTOXml/AutoProfilesDTO.cs
+++ b/DS4Windows/DS4Control/DTOXml/AutoProfilesDTO.cs
@@ -39,6 +39,7 @@ public void MapFrom(AutoProfileHolder source)
         {
             foreach(AutoProfileEntity entity in source.AutoProfileColl)
             {
+                entity.EnsureProfileNames();
                 AutoProfileEntrySerializer temp = new AutoProfileEntrySerializer()
                 {
                     Path = entity.Path,
diff --git a/DS4Windows/DS4Forms/ViewModels/AutoProfilesViewModel.cs b/DS4Windows/DS4Forms/ViewModels/AutoProfilesViewModel.cs
index 1c857c9..ead349e 100644
--- a/DS4Windows/DS4Forms/ViewModels/AutoProfilesViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/AutoProfilesViewModel.cs
@@ -366,10 +366,22 @@ public ProgramItem DuplicateAutoProfileEntry(ProgramItem item)
                 DeviceOption = source.DeviceOption,
                 ApplyToAllControllers = source.ApplyToAllControllers,
             };
-            Array.Copy(source.ProfileNames, duplicate.ProfileNames, source.ProfileNames.Length);
+            source.EnsureProfileNames();
+            duplicate.EnsureProfileNames();
+            Array.Copy(source.ProfileNames, duplicate.ProfileNames,
+                Math.Min(source.ProfileNames.Length, duplicate.ProfileNames.Length));
 
             ProgramItem duplicateItem = new ProgramItem(duplicate.Path, duplicate);
-            autoProfileHolder.AutoProfileColl.Add(duplicate);
+            int sourceProfileIndex = autoProfileHolder.AutoProfileColl.IndexOf(source);
+            int duplicateProfileIndex = sourceProfileIndex + 1;
+            if (duplicateProfileIndex > 0 && duplicateProfileIndex <= autoProfileHolder.AutoProfileColl.Count)
+            {
+                autoProfileHolder.AutoProfileColl.Insert(duplicateProfileIndex, duplicate);
+            }
+            else
+            {
+                autoProfileHolder.AutoProfileColl.Add(duplicate);
+            }
 
             int insertIndex = programColl.IndexOf(item) + 1;
             if (insertIndex > 0 && insertIndex <= programColl.Count)
@@ -388,8 +400,11 @@ public ProgramItem DuplicateAutoProfileEntry(ProgramItem item)
 
         public void RemoveAutoProfileEntry(ProgramItem item)
         {
-            autoProfileHolder.AutoProfileColl.Remove(item.MatchedAutoProfile);
-            item.MatchedAutoProfile = null;
+            if (item?.MatchedAutoProfile != null)
+            {
+                autoProfileHolder.AutoProfileColl.Remove(item.MatchedAutoProfile);
+                item.MatchedAutoProfile = null;
+            }
         }
 
         private string GetTargetPath(string filePath)
@@ -480,16 +495,19 @@ public bool MoveItemUpDown(ProgramItem item, int moveDirection)
             // Move autoprofile item up (-1) or down (1) both in listView (programColl) and in autoProfileHolder data structure (will be written into AutoProfiles.xml file)
             bool itemMoved = true;
             int oldIdx = programColl.IndexOf(item);
+            int oldProfileIdx = item?.MatchedAutoProfile != null ?
+                autoProfileHolder.AutoProfileColl.IndexOf(item.MatchedAutoProfile) : -1;
 
-            if (moveDirection == -1 && oldIdx > 0 && oldIdx < autoProfileHolder.AutoProfileColl.Count)
+            if (moveDirection == -1 && oldIdx > 0 && oldProfileIdx > 0)
             {
                 programColl.Move(oldIdx, oldIdx - 1);
-                autoProfileHolder.AutoProfileColl.Move(oldIdx, oldIdx - 1);
+                autoProfileHolder.AutoProfileColl.Move(oldProfileIdx, oldProfileIdx - 1);
             }
-            else if (moveDirection == 1 && oldIdx >= 0 && oldIdx < programColl.Count - 1 && oldIdx < autoProfileHolder.AutoProfileColl.Count - 1)
+            else if (moveDirection == 1 && oldIdx >= 0 && oldIdx < programColl.Count - 1 &&
+                oldProfileIdx >= 0 && oldProfileIdx < autoProfileHolder.AutoProfileColl.Count - 1)
             {    
                 programColl.Move(oldIdx, oldIdx + 1);
-                autoProfileHolder.AutoProfileColl.Move(oldIdx, oldIdx + 1);
+                autoProfileHolder.AutoProfileColl.Move(oldProfileIdx, oldProfileIdx + 1);
             }
             else
                 itemMoved = false;

From 25078b61195ca59c8ef8d33897dfaac480d1971c Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 7 Jun 2026 14:42:22 -0500
Subject: [PATCH 12/47] Reduce profile switch action input stalls

---
 DS4Windows/DS4Control/Mapping.cs | 133 ++++++++++++++++++++++++++-----
 1 file changed, 113 insertions(+), 20 deletions(-)

diff --git a/DS4Windows/DS4Control/Mapping.cs b/DS4Windows/DS4Control/Mapping.cs
index e251d88..077950a 100644
--- a/DS4Windows/DS4Control/Mapping.cs
+++ b/DS4Windows/DS4Control/Mapping.cs
@@ -106,6 +106,28 @@ public ControlToXInput(DS4Controls input, DS4Controls output)
             new Queue<ControlToXInput>(), new Queue<ControlToXInput>(),
         };
 
+        private class ProfileSwitchRequest
+        {
+            public bool Pending;
+            public bool Running;
+            public bool TempProfile;
+            public bool LaunchProgram;
+            public string ProfileName = string.Empty;
+            public Action<bool> AfterLoad;
+        }
+
+        private static readonly object[] profileSwitchRequestLocks = new object[Global.MAX_DS4_CONTROLLER_COUNT]
+        {
+            new object(), new object(), new object(), new object(),
+            new object(), new object(), new object(), new object(),
+        };
+
+        private static readonly ProfileSwitchRequest[] profileSwitchRequests = new ProfileSwitchRequest[Global.MAX_DS4_CONTROLLER_COUNT]
+        {
+            new ProfileSwitchRequest(), new ProfileSwitchRequest(), new ProfileSwitchRequest(), new ProfileSwitchRequest(),
+            new ProfileSwitchRequest(), new ProfileSwitchRequest(), new ProfileSwitchRequest(), new ProfileSwitchRequest(),
+        };
+
         struct DS4Vector2
         {
             public double x;
@@ -831,6 +853,83 @@ public class DeltaSettingsProcessorGroup
         private const double MOUSESTICKMINVELOCITY = 67.5;
         //private const double MOUSESTICKMINVELOCITY = 40.0;
 
+        private static void RequestProfileSwitch(int device, string profileName, bool tempProfile,
+            bool launchProgram, ControlService ctrl, Action<bool> afterLoad = null)
+        {
+            if (device < 0 || device >= Global.MAX_DS4_CONTROLLER_COUNT)
+            {
+                return;
+            }
+
+            lock (profileSwitchRequestLocks[device])
+            {
+                ProfileSwitchRequest request = profileSwitchRequests[device];
+                request.Pending = true;
+                request.TempProfile = tempProfile;
+                request.LaunchProgram = launchProgram;
+                request.ProfileName = profileName ?? string.Empty;
+                request.AfterLoad = afterLoad;
+
+                if (request.Running)
+                {
+                    return;
+                }
+
+                request.Running = true;
+            }
+
+            Task.Run(() => RunProfileSwitchRequests(device, ctrl));
+        }
+
+        private static void RunProfileSwitchRequests(int device, ControlService ctrl)
+        {
+            while (true)
+            {
+                bool tempProfile;
+                bool launchProgram;
+                string profileName;
+                Action<bool> afterLoad;
+
+                lock (profileSwitchRequestLocks[device])
+                {
+                    ProfileSwitchRequest request = profileSwitchRequests[device];
+                    if (!request.Pending)
+                    {
+                        request.Running = false;
+                        return;
+                    }
+
+                    request.Pending = false;
+                    tempProfile = request.TempProfile;
+                    launchProgram = request.LaunchProgram;
+                    profileName = request.ProfileName;
+                    afterLoad = request.AfterLoad;
+                    request.AfterLoad = null;
+                }
+
+                bool loaded = false;
+                try
+                {
+                    loaded = tempProfile ?
+                        LoadTempProfile(device, profileName, launchProgram, ctrl) :
+                        LoadProfile(device, launchProgram, ctrl);
+                }
+                catch (Exception ex)
+                {
+                    AppLogger.LogToGui($"Profile switch action failed: {ex.Message}", false);
+                }
+
+                try
+                {
+                    afterLoad?.Invoke(loaded);
+                }
+                catch (Exception ex)
+                {
+                    AppLogger.LogToGui($"Profile switch post-load action failed: {ex.Message}", false);
+                }
+            }
+        }
+
         public static void Commit(int device)
         {
             SyntheticState state = deviceState[device];
@@ -4213,29 +4312,23 @@ private static async void MapCustomAction(int device, DS4State cState, DS4State
 
                                     AppLogger.LogToGui(prolog, false);
                                     if (Global.ProfileChangedNotification) AppLogger.LogToTray(prolog);
-                                    Task.Run(() =>
+                                    RequestProfileSwitch(device, action.details, true, true, ctrl, loaded =>
                                     {
-                                        d.HaltReportingRunAction(() =>
+                                        if (loaded && action.uTrigger.Count == 0 && !action.automaticUntrigger)
                                         {
-                                            LoadTempProfile(device, action.details, true, ctrl);
-
-                                            //LoadProfile(device, false, ctrl);
-
-                                            if (action.uTrigger.Count == 0 && !action.automaticUntrigger)
+                                            // If the new profile has any actions with the same action key (controls) than this action
+                                            // then set status of those actions to wait for the release of the existing action key.
+                                            List<string> profileActionsNext = getProfileActions(device);
+                                            for (int actionIndexNext = 0, profileListLenNext = profileActionsNext.Count; actionIndexNext < profileListLenNext; actionIndexNext++)
                                             {
-                                                // If the new profile has any actions with the same action key (controls) than this action (which doesn't have untrigger keys) then set status of those actions to wait for the release of the existing action key. 
-                                                List<string> profileActionsNext = getProfileActions(device);
-                                                for (int actionIndexNext = 0, profileListLenNext = profileActionsNext.Count; actionIndexNext < profileListLenNext; actionIndexNext++)
-                                                {
-                                                    string actionnameNext = profileActionsNext[actionIndexNext];
-                                                    SpecialAction actionNext = GetProfileAction(device, actionnameNext);
-                                                    int indexNext = GetProfileActionIndexOf(device, actionnameNext);
+                                                string actionnameNext = profileActionsNext[actionIndexNext];
+                                                SpecialAction actionNext = GetProfileAction(device, actionnameNext);
+                                                int indexNext = GetProfileActionIndexOf(device, actionnameNext);
 
-                                                    if (actionNext.controls == action.controls)
-                                                        actionDone[indexNext].dev[device] = true;
-                                                }
+                                                if (indexNext >= 0 && actionNext.controls == action.controls)
+                                                    actionDone[indexNext].dev[device] = true;
                                             }
-                                        });
+                                        }
                                     });
 
                                     return;
@@ -4706,9 +4799,9 @@ private static async void MapCustomAction(int device, DS4State cState, DS4State
                             untriggeraction[device] = null;
 
                             if (profileName == string.Empty)
-                                LoadProfile(device, false, ctrl); // Previous profile was a regular default profile of a controller
+                                RequestProfileSwitch(device, string.Empty, false, false, ctrl); // Previous profile was a regular default profile of a controller
                             else
-                                LoadTempProfile(device, profileName, true, ctrl); // Previous profile was a temporary profile, so re-load it as a temp profile
+                                RequestProfileSwitch(device, profileName, true, true, ctrl); // Previous profile was a temporary profile, so re-load it as a temp profile
                         }
                     }
                 }

From 6a0ca1a74f3690d1cdbc65b7c0decde9d29a9e57 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 7 Jun 2026 18:50:16 -0500
Subject: [PATCH 13/47] Bump version to 4.0.2

---
 DS4Windows/DS4WinWPF.csproj | 8 ++++----
 DS4Windows/newest.txt       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DS4Windows/DS4WinWPF.csproj b/DS4Windows/DS4WinWPF.csproj
index 8b6d345..4bff668 100644
--- a/DS4Windows/DS4WinWPF.csproj
+++ b/DS4Windows/DS4WinWPF.csproj
@@ -15,10 +15,10 @@
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
 		<EnableNETAnalyzers>false</EnableNETAnalyzers>
 		<ServerGarbageCollection>true</ServerGarbageCollection>
-		<AssemblyVersion>4.0.1</AssemblyVersion>
-		<FileVersion>4.0.1</FileVersion>
-		<Version>4.0.1</Version>
-		<InformationalVersion>4.0.1</InformationalVersion>
+		<AssemblyVersion>4.0.2</AssemblyVersion>
+		<FileVersion>4.0.2</FileVersion>
+		<Version>4.0.2</Version>
+		<InformationalVersion>4.0.2</InformationalVersion>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
diff --git a/DS4Windows/newest.txt b/DS4Windows/newest.txt
index 77caa0f..4d54dad 100644
--- a/DS4Windows/newest.txt
+++ b/DS4Windows/newest.txt
@@ -1 +1 @@
-3.9.9
\ No newline at end of file
+4.0.2

From 2ef63cafaa155d22f75c8dc689e8eec1d32e9459 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 7 Jun 2026 19:09:08 -0500
Subject: [PATCH 14/47] Fix changelog markdown spacing

---
 DS4Windows/DS4Control/ScpUtil.cs | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index a63d300..8afaedc 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -3465,10 +3465,19 @@ public static async Task<string> GetChangelogMarkdown(bool allVersions = false)
             StringBuilder sb = new();
             foreach (var version in versions)
             {
+                var parsedChangelog = ParseChangelogString(version.Value);
+                if (string.IsNullOrWhiteSpace(parsedChangelog)) continue;
+
+                if (sb.Length > 0)
+                {
+                    sb.AppendLine();
+                    sb.AppendLine();
+                }
+
                 sb.Append("## Version ");
                 sb.Append(version.Key);
-                sb.Append(Environment.NewLine);
-                var parsedChangelog = ParseChangelogString(version.Value);
+                sb.AppendLine();
+                sb.AppendLine();
                 sb.Append(parsedChangelog);
             }
 
@@ -3477,9 +3486,17 @@ public static async Task<string> GetChangelogMarkdown(bool allVersions = false)
 
         private static string ParseChangelogString(string changelog)
         {
-            var split = changelog.Split("\n").ToList();
+            if (string.IsNullOrWhiteSpace(changelog)) return string.Empty;
+
+            var split = changelog
+                .Replace("\r\n", "\n")
+                .Replace("\r", "\n")
+                .Split("\n")
+                .Select(x => x.TrimEnd())
+                .ToList();
+
             split.RemoveAll(x => x.StartsWith("**Full Changelog**"));
-            return string.Join(Environment.NewLine, split);
+            return string.Join(Environment.NewLine, split).Trim();
         }
     }
 

From 3bed4a432c84032ba2f6aaea7e399ede15370e57 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 7 Jun 2026 19:45:50 -0500
Subject: [PATCH 15/47] Prefer virtual mouse for stick mouse profiles

---
 DS4Windows/DS4Control/ControlService.cs | 145 ++++++++++++++++++++++--
 1 file changed, 136 insertions(+), 9 deletions(-)

diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 7623f2f..13fc2c1 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -92,6 +92,9 @@ public class ControlService
         private HashSet<string> hidDeviceHidingExemptedDevs = new HashSet<string>();
         private bool hidDeviceHidingForced = false;
         private bool hidDeviceHidingEnabled = false;
+        private bool stickMouseFakerInputNoticeShown = false;
+        private bool stickMouseFakerInputMissingNoticeShown = false;
+        private readonly object outputKbmHandlerLock = new object();
 
         private ControlServiceDeviceOptions deviceOptions;
         public ControlServiceDeviceOptions DeviceOptions { get => deviceOptions; }
@@ -461,23 +464,31 @@ private void CreateOSCCallback()
 
         public void RefreshOutputKBMHandler()
         {
-            if (Global.outputKBMHandler != null)
+            lock (outputKbmHandlerLock)
             {
-                Global.outputKBMHandler.Disconnect();
-                Global.outputKBMHandler = null;
-            }
+                if (Global.outputKBMHandler != null)
+                {
+                    Global.outputKBMHandler.Disconnect();
+                    Global.outputKBMHandler = null;
+                }
 
-            if (Global.outputKBMMapping != null)
-            {
-                Global.outputKBMMapping = null;
-            }
+                if (Global.outputKBMMapping != null)
+                {
+                    Global.outputKBMMapping = null;
+                }
 
-            InitOutputKBMHandler();
+                InitOutputKBMHandler();
+            }
         }
 
         private void InitOutputKBMHandler()
         {
             string attemptVirtualkbmHandler = cmdParser.VirtualkbmHandler;
+            InitOutputKBMHandler(attemptVirtualkbmHandler);
+        }
+
+        private void InitOutputKBMHandler(string attemptVirtualkbmHandler)
+        {
             Global.InitOutputKBMHandler(attemptVirtualkbmHandler);
 
             bool handlerConnected = false;
@@ -506,6 +517,120 @@ private void InitOutputKBMHandler()
             Global.outputKBMMapping.PopulateMappings();
         }
 
+        private bool SwitchOutputKBMHandler(string identifier)
+        {
+            lock (outputKbmHandlerLock)
+            {
+                if (Global.outputKBMHandler != null &&
+                    Global.outputKBMHandler.GetIdentifier() == identifier)
+                {
+                    return true;
+                }
+
+                VirtualKBMBase oldHandler = Global.outputKBMHandler;
+                VirtualKBMMapping oldMapping = Global.outputKBMMapping;
+
+                try
+                {
+                    InitOutputKBMHandler(identifier);
+                    if (Global.outputKBMHandler?.GetIdentifier() == identifier)
+                    {
+                        RefreshLoadedActionAliases();
+                        oldHandler?.Disconnect();
+                        return true;
+                    }
+                }
+                catch { }
+
+                Global.outputKBMHandler?.Disconnect();
+                Global.outputKBMHandler = oldHandler;
+                Global.outputKBMMapping = oldMapping;
+                return false;
+            }
+        }
+
+        private void EnsureVirtualMouseForStickMouseProfile(int ind)
+        {
+            if (!ProfileUsesStickMouse(ind))
+            {
+                return;
+            }
+
+            if (Global.outputKBMHandler?.GetIdentifier() == FakerInputHandler.IDENTIFIER)
+            {
+                return;
+            }
+
+            Global.RefreshFakerInputInfo();
+            if (Global.fakerInputInstalled)
+            {
+                bool switched = SwitchOutputKBMHandler(FakerInputHandler.IDENTIFIER);
+                if (switched && !stickMouseFakerInputNoticeShown)
+                {
+                    stickMouseFakerInputNoticeShown = true;
+                    LogDebug("Stick mouse profile detected. Using FakerInput virtual mouse so Windows keeps a real pointer device available.");
+                }
+                else if (!switched && !stickMouseFakerInputMissingNoticeShown)
+                {
+                    stickMouseFakerInputMissingNoticeShown = true;
+                    LogDebug("Stick mouse profile detected, but DS4Windows could not connect to FakerInput. SendInput will remain active.");
+                }
+
+                return;
+            }
+
+            if (!stickMouseFakerInputMissingNoticeShown)
+            {
+                stickMouseFakerInputMissingNoticeShown = true;
+                string helpURL = "https://github.com/Ryochan7/FakerInput/";
+                LogDebug($"Stick mouse profile detected, but FakerInput is not installed. Install FakerInput to expose a persistent virtual mouse and avoid hidden cursor behavior on couch/TV setups: {helpURL}");
+                AppLogger.LogToTray("Stick mouse works best with FakerInput installed for a persistent virtual mouse.");
+            }
+        }
+
+        private static bool ProfileUsesStickMouse(int ind)
+        {
+            return StickDirectionMapsToMouse(ind, DS4Controls.LXNeg) ||
+                StickDirectionMapsToMouse(ind, DS4Controls.LXPos) ||
+                StickDirectionMapsToMouse(ind, DS4Controls.LYNeg) ||
+                StickDirectionMapsToMouse(ind, DS4Controls.LYPos) ||
+                StickDirectionMapsToMouse(ind, DS4Controls.RXNeg) ||
+                StickDirectionMapsToMouse(ind, DS4Controls.RXPos) ||
+                StickDirectionMapsToMouse(ind, DS4Controls.RYNeg) ||
+                StickDirectionMapsToMouse(ind, DS4Controls.RYPos);
+        }
+
+        private static bool StickDirectionMapsToMouse(int ind, DS4Controls control)
+        {
+            DS4ControlSettings setting = GetDS4CSetting(ind, control);
+            return ActionMapsToMouse(setting.actionType, setting.action.actionBtn) ||
+                ActionMapsToMouse(setting.shiftActionType, setting.shiftAction.actionBtn);
+        }
+
+        private static bool ActionMapsToMouse(DS4ControlSettings.ActionType actionType, X360Controls outputControl)
+        {
+            if (actionType != DS4ControlSettings.ActionType.Button)
+            {
+                return false;
+            }
+
+            return outputControl >= X360Controls.MouseUp &&
+                outputControl <= X360Controls.AbsMouseRight;
+        }
+
+        private static void RefreshLoadedActionAliases()
+        {
+            for (int device = 0; device < Global.MAX_DS4_CONTROLLER_COUNT; device++)
+            {
+                foreach (DS4Controls control in Enum.GetValues(typeof(DS4Controls)))
+                {
+                    DS4ControlSettings setting = GetDS4CSetting(device, control);
+                    Global.RefreshActionAlias(setting, false);
+                    Global.RefreshActionAlias(setting, true);
+                }
+            }
+        }
+
         private void OutputslotMan_ViGEmFailure(object sender, int errorCode)
         {
             eventDispatcher.BeginInvoke((Action)(() =>
@@ -2196,6 +2321,8 @@ private void ChangeUdpSmoothingAttrs(object sender, EventArgs e)
 
         public void CheckProfileOptions(int ind, DS4Device device, bool startUp = false)
         {
+            EnsureVirtualMouseForStickMouseProfile(ind);
+
             device.ModifyFeatureSetFlag(VidPidFeatureSet.NoOutputData, !getEnableOutputDataToDS4(ind));
             if (!getEnableOutputDataToDS4(ind))
                 LogDebug("Output data to DS4 disabled. Lightbar and rumble events are not written to DS4 gamepad. If the gamepad is connected over BT then IdleDisconnect option is recommended to let DS4Windows to close the connection after long period of idling.");

From 37000d4b30dcddc411cc2629904b8fee7f79522e Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Mon, 8 Jun 2026 09:29:09 -0500
Subject: [PATCH 16/47] Add virtual controller crash diagnostics

---
 DS4Windows/DS4Control/ControlService.cs    | 21 ++++++++++++++
 DS4Windows/DS4Control/OutputSlotManager.cs | 21 +++++++++++++-
 DS4Windows/DS4Control/ScpUtil.cs           | 28 ++++++++++++++++--
 DS4Windows/DS4Library/DS4Devices.cs        | 33 +++++++++++++++++++---
 4 files changed, 96 insertions(+), 7 deletions(-)

diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 13fc2c1..1a0b37a 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -724,6 +724,8 @@ public bool CheckForSupportedDevice(HidDevice device, VidPidInfo metaInfo)
                     break;
             }
 
+            bool isVirtual = Global.CheckIfVirtualDevice(device.DevicePath);
+            LogDebug($"VCrashDiag: Support filter result. Supported={result} Type={metaInfo.inputDevType} Name={metaInfo.name} FeatureSet={metaInfo.featureSet:F} IsVirtual={isVirtual} UseMoonlight={Global.UseMoonlight} AdvancedMoonlight={Global.UseAdvancedMoonlight} VID={device.Attributes.VendorHexId} PID={device.Attributes.ProductHexId} UsagePage=0x{device.Capabilities.UsagePage:X} Usage=0x{device.Capabilities.Usage:X} Path={device.DevicePath}");
             return result;
         }
 
@@ -1495,11 +1497,13 @@ public void DetachUnboundOutDev(OutSlotDevice slotDevice)
         public void PluginOutDev(int index, DS4Device device)
         {
             OutContType contType = Global.OutContType[index];
+            LogDebug($"VCrashDiag: PluginOutDev enter. Controller={index + 1} DesiredOut={contType} UseDInputOnly={useDInputOnly[index]} GlobalDInputOnly={getDInputOnly(index)} ActiveOut={activeOutDevType[index]} ExistingOut={(outputDevices[index]?.GetDeviceType() ?? "<none>")} Device={device.DisplayName} Type={device.DeviceType} Serial={device.MacAddress} Synced={device.isSynced()} Alive={device.IsAlive()} Path={device.HidDevice?.DevicePath}");
 
             OutSlotDevice slotDevice = null;
             if (!getDInputOnly(index))
             {
                 slotDevice = outputslotMan.FindExistUnboundSlotType(contType);
+                LogDebug($"VCrashDiag: Existing unbound slot lookup. Controller={index + 1} DesiredOut={contType} FoundSlot={(slotDevice != null ? (slotDevice.Index + 1).ToString() : "<none>")}");
             }
 
             if (useDInputOnly[index])
@@ -1512,10 +1516,12 @@ public void PluginOutDev(int index, DS4Device device)
                     if (slotDevice == null)
                     {
                         slotDevice = outputslotMan.FindOpenSlot();
+                        LogDebug($"VCrashDiag: X360 open slot lookup. Controller={index + 1} FoundSlot={(slotDevice != null ? (slotDevice.Index + 1).ToString() : "<none>")}");
                         if (slotDevice != null)
                         {
                             Xbox360OutDevice tempXbox = EstablishOutDevice(index, OutContType.X360)
                             as Xbox360OutDevice;
+                            LogDebug($"VCrashDiag: Established X360 output device. Controller={index + 1} OutputNull={tempXbox == null}");
                             //outputDevices[index] = tempXbox;
 
                             // Enable ViGem feedback callback handler only if lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
@@ -1547,6 +1553,7 @@ public void PluginOutDev(int index, DS4Device device)
                     {
                         slotDevice.CurrentInputBound = OutSlotDevice.InputBound.Bound;
                         Xbox360OutDevice tempXbox = slotDevice.OutputDevice as Xbox360OutDevice;
+                        LogDebug($"VCrashDiag: Reusing unbound X360 output slot. Controller={index + 1} Slot={slotDevice.Index + 1} OutputNull={tempXbox == null}");
 
                         // Enable ViGem feedback callback handler only if lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
                         if (Global.EnableOutputDataToDS4[index])
@@ -1577,10 +1584,12 @@ public void PluginOutDev(int index, DS4Device device)
                     if (slotDevice == null)
                     {
                         slotDevice = outputslotMan.FindOpenSlot();
+                        LogDebug($"VCrashDiag: DS4 open slot lookup. Controller={index + 1} FoundSlot={(slotDevice != null ? (slotDevice.Index + 1).ToString() : "<none>")}");
                         if (slotDevice != null)
                         {
                             DS4OutDevice tempDS4 = EstablishOutDevice(index, OutContType.DS4)
                             as DS4OutDevice;
+                            LogDebug($"VCrashDiag: Established DS4 output device. Controller={index + 1} OutputNull={tempDS4 == null} UseMoonlight={Global.UseMoonlight}");
 
                             // Enable ViGem feedback callback handler only if DS4 lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
                             if (Global.EnableOutputDataToDS4[index])
@@ -1611,6 +1620,7 @@ public void PluginOutDev(int index, DS4Device device)
                     {
                         slotDevice.CurrentInputBound = OutSlotDevice.InputBound.Bound;
                         DS4OutDevice tempDS4 = slotDevice.OutputDevice as DS4OutDevice;
+                        LogDebug($"VCrashDiag: Reusing unbound DS4 output slot. Controller={index + 1} Slot={slotDevice.Index + 1} OutputNull={tempDS4 == null}");
 
                         // Enable ViGem feedback callback handler only if lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
                         if (Global.EnableOutputDataToDS4[index])
@@ -1645,13 +1655,23 @@ public void PluginOutDev(int index, DS4Device device)
                 if (success && slotDevice.OutputDevice != null)
                 {
                     LogDebug($"Associated input controller #{index + 1} ({device.DisplayName}) to virtual {slotDevice.OutputDevice.GetDeviceType()} Controller in{(slotDevice.PermanentType != OutContType.None ? " permanent" : "")} output slot #{slotDevice.Index + 1}");
+                    LogDebug($"VCrashDiag: PluginOutDev success. Controller={index + 1} Slot={slotDevice.Index + 1} Output={slotDevice.OutputDevice.GetDeviceType()} Reserve={slotDevice.CurrentReserveStatus} Attach={slotDevice.CurrentAttachedStatus} InputBound={slotDevice.CurrentInputBound}");
                     useDInputOnly[index] = false;
                 }
+                else
+                {
+                    LogDebug($"VCrashDiag: PluginOutDev did not associate output. Controller={index + 1} Success={success} SlotNull={slotDevice == null} SlotOutputNull={slotDevice?.OutputDevice == null}");
+                }
+            }
+            else
+            {
+                LogDebug($"VCrashDiag: PluginOutDev skipped because useDInputOnly is false. Controller={index + 1} ExistingOut={(outputDevices[index]?.GetDeviceType() ?? "<none>")}");
             }
         }
 
         public void UnplugOutDev(int index, DS4Device device, bool immediate = false, bool force = false)
         {
+            LogDebug($"VCrashDiag: UnplugOutDev enter. Controller={index + 1} Immediate={immediate} Force={force} UseDInputOnly={useDInputOnly[index]} ActiveOut={activeOutDevType[index]} ExistingOut={(outputDevices[index]?.GetDeviceType() ?? "<none>")} Device={device.DisplayName} Type={device.DeviceType} Serial={device.MacAddress} Synced={device.isSynced()} Alive={device.IsAlive()} Path={device.HidDevice?.DevicePath}");
             if (!useDInputOnly[index])
             {
                 //OutContType contType = Global.OutContType[index];
@@ -1661,6 +1681,7 @@ public void UnplugOutDev(int index, DS4Device device, bool immediate = false, bo
                 {
                     string tempType = dev.GetDeviceType();
                     LogDebug($"Disassociated virtual {tempType} Controller in{(slotDevice.CurrentReserveStatus == OutSlotDevice.ReserveStatus.Permanent ? " permanent" : "")} output slot #{slotDevice.Index + 1} from input controller #{index + 1} ({device.DisplayName})", false);
+                    LogDebug($"VCrashDiag: UnplugOutDev slot state. Controller={index + 1} Slot={slotDevice.Index + 1} Output={tempType} Reserve={slotDevice.CurrentReserveStatus} Attach={slotDevice.CurrentAttachedStatus} InputBound={slotDevice.CurrentInputBound}");
 
                     OutContType currentType = activeOutDevType[index];
                     outputDevices[index] = null;
diff --git a/DS4Windows/DS4Control/OutputSlotManager.cs b/DS4Windows/DS4Control/OutputSlotManager.cs
index f782952..6a410d3 100644
--- a/DS4Windows/DS4Control/OutputSlotManager.cs
+++ b/DS4Windows/DS4Control/OutputSlotManager.cs
@@ -113,6 +113,7 @@ public void Stop(bool immediate = false)
         public OutputDevice AllocateController(OutContType contType, ViGEmClient client)
         {
             OutputDevice outputDevice = null;
+            AppLogger.LogToGui($"VCrashDiag: AllocateController enter. RequestedType={contType} ViGEmVersion={Global.vigemBusVersion} SupportedViGEm={Global.IsRunningSupportedViGEmBus()}", false, true);
             switch (contType)
             {
                 case OutContType.X360:
@@ -135,6 +136,7 @@ public OutputDevice AllocateController(OutContType contType, ViGEmClient client)
                     break;
             }
 
+            AppLogger.LogToGui($"VCrashDiag: AllocateController exit. RequestedType={contType} OutputNull={outputDevice == null} OutputType={(outputDevice?.GetDeviceType() ?? "<none>")}", false, true);
             return outputDevice;
         }
 
@@ -162,6 +164,7 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
             //Action tempAction = new Action(() =>
             {
                 int slot = FindEmptySlot();
+                AppLogger.LogToGui($"VCrashDiag: DeferredPlugin enter. InputIndex={inIdx} Display={inDisplayString} RequestedType={contType} OutputNull={outputDevice == null} EmptySlot={(slot != -1 ? (slot + 1).ToString() : "<none>")} UseMoonlight={Global.UseMoonlight}", false, true);
                 if (slot != -1)
                 {
                     // Only relevant when Virtual Controller (Moonlight) support is on and
@@ -175,10 +178,12 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
 
                     try
                     {
+                        AppLogger.LogToGui($"VCrashDiag: Connecting virtual output. Slot={slot + 1} Type={contType} OutputType={(outputDevice?.GetDeviceType() ?? "<none>")}", false, true);
                         outputDevice.Connect();
                     }
                     catch (Win32Exception e)
                     {
+                        AppLogger.LogToGui($"VCrashDiag: Virtual output connect failed. Slot={slot + 1} Type={contType} ErrorCode={e.ErrorCode} NativeErrorCode={e.NativeErrorCode} Message={e.Message}", true, true);
                         // Leave task immediately if connect call failed
                         //queuedTasks--;
                         ViGEmFailure?.Invoke(this, e.ErrorCode);
@@ -188,6 +193,7 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
                     if (beforeVirtualDS4 != null)
                     {
                         DS4Devices.RegisterOwnVirtualDS4(beforeVirtualDS4);
+                        AppLogger.LogToGui($"VCrashDiag: Registered own virtual DS4 after connect. Slot={slot + 1} Type={contType}", false, true);
                     }
 
                     if (contType == OutContType.X360)
@@ -210,6 +216,11 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
                         outputSlots[slot].CurrentInputBound = OutSlotDevice.InputBound.Bound;
                     }
                     SlotAssigned?.Invoke(this, slot, outputSlots[slot]);
+                    AppLogger.LogToGui($"VCrashDiag: DeferredPlugin exit. Slot={slot + 1} InputIndex={inIdx} Attach={outputSlots[slot].CurrentAttachedStatus} Bound={outputSlots[slot].CurrentInputBound} Reserve={outputSlots[slot].CurrentReserveStatus}", false, true);
+                }
+                else
+                {
+                    AppLogger.LogToGui($"VCrashDiag: DeferredPlugin found no empty slot. InputIndex={inIdx} RequestedType={contType}", false, true);
                 }
             };
 
@@ -226,13 +237,16 @@ public void DeferredRemoval(OutputDevice outputDevice, int inIdx,
             //queuedTasks++;
 
             {
+                AppLogger.LogToGui($"VCrashDiag: DeferredRemoval enter. InputIndex={inIdx} OutputNull={outputDevice == null} OutputType={(outputDevice?.GetDeviceType() ?? "<none>")} Immediate={immediate}", false, true);
                 if (revDeviceDict.TryGetValue(outputDevice, out int slot))
                 {
+                    AppLogger.LogToGui($"VCrashDiag: DeferredRemoval slot found. Slot={slot + 1} OutputType={outputDevice.GetDeviceType()} Attach={outputSlots[slot].CurrentAttachedStatus} Bound={outputSlots[slot].CurrentInputBound} Reserve={outputSlots[slot].CurrentReserveStatus}", false, true);
                     //int slot = revDeviceDict[outputDevice];
                     outputDevices[slot] = null;
                     deviceDict.Remove(slot);
                     revDeviceDict.Remove(outputDevice);
 
+                    AppLogger.LogToGui($"VCrashDiag: Removing feedback and disconnecting output. Slot={slot + 1} OutputType={outputDevice.GetDeviceType()}", false, true);
                     outputDevice.RemoveFeedbacks();
                     outputDevice.Disconnect();
 
@@ -244,12 +258,17 @@ public void DeferredRemoval(OutputDevice outputDevice, int inIdx,
                     outputSlots[slot].DetachDevice();
                     SlotUnassigned?.Invoke(this, slot, outputSlots[slot]);
                     AppLogger.LogToGui($"Unplugging virtual {outputDevice.GetDeviceType()} Controller from output slot #{slot + 1}",false);
+                    AppLogger.LogToGui($"VCrashDiag: DeferredRemoval exit. Slot={slot + 1} InputIndex={inIdx}", false, true);
 
                     //if (!immediate)
                     //{
-                    //    Task.Delay(DELAY_TIME).Wait();
+                        //    Task.Delay(DELAY_TIME).Wait();
                     //}
                 }
+                else
+                {
+                    AppLogger.LogToGui($"VCrashDiag: DeferredRemoval could not find output in reverse dictionary. InputIndex={inIdx} OutputType={(outputDevice?.GetDeviceType() ?? "<none>")}", false, true);
+                }
             };
 
             //queuedTasks--;
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index 8afaedc..cddaba8 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -5390,6 +5390,9 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
             else
                 profilepath = propath;
 
+            DS4Device diagDevice = device < ControlService.CURRENT_DS4_CONTROLLER_LIMIT ? control.DS4Controllers[device] : null;
+            AppLogger.LogToGui($"VCrashDiag: LoadProfileNew enter. Controller={device + 1} ProfileName={profilePath[device]} ProfilePath={profilepath} Exists={File.Exists(profilepath)} LaunchProgram={launchprogram} XInputChange={xinputChange} PostLoad={postLoad} CurrentOut={Global.activeOutDevType[device]} DesiredOut={outputDevType[device]} DInputOnly={dinputOnly[device]} DeviceNull={diagDevice == null} Device={(diagDevice?.DisplayName ?? "<none>")} Type={(diagDevice?.DeviceType.ToString() ?? "<none>")} Serial={(diagDevice?.MacAddress ?? "<none>")} Synced={(diagDevice?.isSynced().ToString() ?? "<none>")} Alive={(diagDevice?.IsAlive().ToString() ?? "<none>")} Path={(diagDevice?.HidDevice?.DevicePath ?? "<none>")}", false, true);
+
             if (File.Exists(profilepath))
             {
                 string profileXml = string.Empty;
@@ -5440,6 +5443,7 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                 // Reset some Mapping properties before attempting to load different
                 // profile
                 control.PreLoadReset(device);
+                AppLogger.LogToGui($"VCrashDiag: LoadProfileNew reset complete. Controller={device + 1} OldOut={oldContType}", false, true);
 
                 profileActions[device].Clear();
                 foreach (DS4ControlSettings dcs in ds4settings[device])
@@ -5454,15 +5458,18 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                     ProfileDTO dto = serializer.Deserialize(sr) as ProfileDTO;
                     dto.DeviceIndex = device;
                     dto.MapTo(this);
+                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew DTO mapped. Controller={device + 1} ProfileName={profilePath[device]} DesiredOut={outputDevType[device]} DInputOnly={dinputOnly[device]} EnableOutputData={enableOutputDataToDS4[device]} Actions={profileActions[device].Count}", false, true);
                 }
                 catch (InvalidOperationException e)
                 {
-                    AppLogger.LogToGui($"Failed to load {profilepath}. {e.InnerException.Message}", false);
+                    AppLogger.LogToGui($"Failed to load {profilepath}. {e.InnerException?.Message ?? e.Message}", false);
+                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew deserialize failure. Controller={device + 1} Exception={e}", true, true);
                     loaded = false;
                 }
                 catch (XmlException e)
                 {
-                    AppLogger.LogToGui($"Failed to load {profilepath}. Invalid XML. {e.InnerException.Message}", false);
+                    AppLogger.LogToGui($"Failed to load {profilepath}. Invalid XML. {e.InnerException?.Message ?? e.Message}", false);
+                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew XML failure. Controller={device + 1} Exception={e}", true, true);
                     loaded = false;
                 }
 
@@ -5488,6 +5495,7 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                 {
                     CheckOldDevicestatus(device, control, oldContType,
                         out xinputPlug, out xinputStatus);
+                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew output status check. Controller={device + 1} OldOut={oldContType} NewOut={outputDevType[device]} XInputStatus={xinputStatus} XInputPlug={xinputPlug} OldDInputOnly={Global.useDInputOnly[device]} NewDInputOnly={dinputOnly[device]}", false, true);
                 }
 
                 CacheProfileCustomsFlags(device);
@@ -5559,7 +5567,9 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                 // options to device instance
                 if (postLoad && device < Global.MAX_DS4_CONTROLLER_COUNT)
                 {
+                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew before PostLoadSnippet. Controller={device + 1} XInputStatus={xinputStatus} XInputPlug={xinputPlug}", false, true);
                     PostLoadSnippet(device, control, xinputStatus, xinputPlug);
+                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew after PostLoadSnippet. Controller={device + 1}", false, true);
                 }
 
                 // Migration was performed. Save new XML schema in file
@@ -5571,6 +5581,7 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
             }
             else
             {
+                AppLogger.LogToGui($"VCrashDiag: LoadProfileNew missing profile path. Controller={device + 1} ProfilePath={profilepath}", true, true);
                 loaded = false;
                 ResetProfile(device);
                 ResetMouseProperties(device, control);
@@ -5606,6 +5617,7 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                 }
             }
 
+            AppLogger.LogToGui($"VCrashDiag: LoadProfileNew exit. Controller={device + 1} Loaded={loaded} ProfileName={profilePath[device]} DesiredOut={outputDevType[device]} DInputOnly={dinputOnly[device]}", false, true);
             return loaded;
         }
 
@@ -10519,6 +10531,7 @@ private void CheckOldDevicestatus(int device, ControlService control,
                 bool exists = tempBool = (tempDevice != null);
                 bool synced = tempBool = exists ? tempDevice.isSynced() : false;
                 bool isAlive = tempBool = exists ? tempDevice.IsAlive() : false;
+                AppLogger.LogToGui($"VCrashDiag: CheckOldDevicestatus. Controller={device + 1} Exists={exists} Synced={synced} Alive={isAlive} OldOut={oldContType} NewOut={outputDevType[device]} OldDInputOnly={oldUseDInputOnly} NewDInputOnly={dinputOnly[device]}", false, true);
                 if (dinputOnly[device] != oldUseDInputOnly)
                 {
                     if (dinputOnly[device] == true)
@@ -10544,10 +10557,12 @@ private void CheckOldDevicestatus(int device, ControlService control,
         private void PostLoadSnippet(int device, ControlService control, bool xinputStatus, bool xinputPlug)
         {
             DS4Device tempDev = control.DS4Controllers[device];
+            AppLogger.LogToGui($"VCrashDiag: PostLoadSnippet enter. Controller={device + 1} DeviceNull={tempDev == null} XInputStatus={xinputStatus} XInputPlug={xinputPlug} DesiredOut={outputDevType[device]} DInputOnly={dinputOnly[device]} ExistingOut={(control.outputDevices[device]?.GetDeviceType() ?? "<none>")}", false, true);
             if (tempDev != null && tempDev.isSynced())
             {
                 tempDev.queueEvent(() =>
                 {
+                    AppLogger.LogToGui($"VCrashDiag: PostLoad queued action start. Controller={device + 1} Device={tempDev.DisplayName} Type={tempDev.DeviceType} Serial={tempDev.MacAddress} Synced={tempDev.isSynced()} Alive={tempDev.IsAlive()} XInputStatus={xinputStatus} XInputPlug={xinputPlug} ExistingOut={(control.outputDevices[device]?.GetDeviceType() ?? "<none>")}", false, true);
                     //tempDev.setIdleTimeout(idleDisconnectTimeout[device]);
                     //tempDev.setBTPollRate(btPollRate[device]);
                     if (xinputStatus && tempDev.PrimaryDevice)
@@ -10557,18 +10572,21 @@ private void PostLoadSnippet(int device, ControlService control, bool xinputStat
                             OutputDevice tempOutDev = control.outputDevices[device];
                             if (tempOutDev != null)
                             {
+                                AppLogger.LogToGui($"VCrashDiag: PostLoad queued action unplug before replug. Controller={device + 1} Output={tempOutDev.GetDeviceType()}", false, true);
                                 tempOutDev = null;
                                 //Global.activeOutDevType[device] = OutContType.None;
                                 control.UnplugOutDev(device, tempDev);
                             }
 
                             OutContType tempContType = outputDevType[device];
+                            AppLogger.LogToGui($"VCrashDiag: PostLoad queued action plugin after profile change. Controller={device + 1} DesiredOut={tempContType}", false, true);
                             control.PluginOutDev(device, tempDev);
                             //Global.useDInputOnly[device] = false;
                         }
                         else
                         {
                             //Global.activeOutDevType[device] = OutContType.None;
+                            AppLogger.LogToGui($"VCrashDiag: PostLoad queued action unplug only after profile change. Controller={device + 1}", false, true);
                             control.UnplugOutDev(device, tempDev);
                         }
                     }
@@ -10576,11 +10594,17 @@ private void PostLoadSnippet(int device, ControlService control, bool xinputStat
                     //tempDev.RumbleAutostopTime = rumbleAutostopTime[device];
                     //tempDev.setRumble(0, 0);
                     //tempDev.LightBarColor = Global.getMainColor(device);
+                    AppLogger.LogToGui($"VCrashDiag: PostLoad queued action before CheckProfileOptions. Controller={device + 1}", false, true);
                     control.CheckProfileOptions(device, tempDev, true);
+                    AppLogger.LogToGui($"VCrashDiag: PostLoad queued action end. Controller={device + 1} ExistingOut={(control.outputDevices[device]?.GetDeviceType() ?? "<none>")}", false, true);
                 });
 
                 //Program.rootHub.touchPad[device]?.ResetTrackAccel(trackballFriction[device]);
             }
+            else
+            {
+                AppLogger.LogToGui($"VCrashDiag: PostLoadSnippet skipped because controller is null or not synced. Controller={device + 1}", false, true);
+            }
         }
     }
 
diff --git a/DS4Windows/DS4Library/DS4Devices.cs b/DS4Windows/DS4Library/DS4Devices.cs
index 3579c87..1a4329d 100644
--- a/DS4Windows/DS4Library/DS4Devices.cs
+++ b/DS4Windows/DS4Library/DS4Devices.cs
@@ -285,13 +285,24 @@ private static bool IsRealDS4(HidDevice hDevice)
         {
             // Our own virtual output controllers are never valid input, regardless of
             // mode. This is what breaks the Moonlight + DS4-output feedback loop.
-            if (IsOwnVirtualDevice(hDevice.DevicePath)) return false;
+            if (IsOwnVirtualDevice(hDevice.DevicePath))
+            {
+                AppLogger.LogToGui($"VCrashDiag: Rejecting own virtual DS4 output as input. VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false, true);
+                return false;
+            }
+
+            bool isVirtualDevice = Global.CheckIfVirtualDevice(hDevice.DevicePath);
+            AppLogger.LogToGui($"VCrashDiag: Evaluating possible DS4 input. UseMoonlight={Global.UseMoonlight} AdvancedMoonlight={Global.UseAdvancedMoonlight} IsVirtual={isVirtualDevice} VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} UsagePage=0x{hDevice.Capabilities.UsagePage:X} Usage=0x{hDevice.Capabilities.Usage:X} Path={hDevice.DevicePath}", false, true);
 
-            if (!Global.UseMoonlight) return !Global.CheckIfVirtualDevice(hDevice.DevicePath);
+            if (!Global.UseMoonlight) return !isVirtualDevice;
             if (!Global.UseAdvancedMoonlight)
             {
                 // this approach should work on most devices, but not on my pc for some reason
-                if (hDevice.Attributes.VendorId == 1356 && hDevice.Attributes.ProductId == 1476) return true;
+                if (hDevice.Attributes.VendorId == 1356 && hDevice.Attributes.ProductId == 1476)
+                {
+                    AppLogger.LogToGui("VCrashDiag: Accepting Moonlight virtual DS4 by VID/PID with basic Moonlight support.", false, true);
+                    return true;
+                }
             }
             else
             {
@@ -309,12 +320,15 @@ private static bool IsRealDS4(HidDevice hDevice)
                     if (DetectNewControllers)
                     {
                         DetectNewControllers = false;
+                        AppLogger.LogToGui("VCrashDiag: Accepting Moonlight virtual DS4 by VID/PID with advanced Moonlight cooldown.", false, true);
                         return true;
                     }
+                    AppLogger.LogToGui($"VCrashDiag: Rejecting Moonlight virtual DS4 during advanced Moonlight cooldown. DetectNewControllers={DetectNewControllers}", false, true);
                     return DetectNewControllers;
                 }
             }
-            return !Global.CheckIfVirtualDevice(hDevice.DevicePath);
+            AppLogger.LogToGui($"VCrashDiag: Default DS4 input decision={!isVirtualDevice} for VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId}", false, true);
+            return !isVirtualDevice;
         }
 
         // Enumerates ds4 controllers in the system
@@ -358,12 +372,19 @@ public static void findControllers()
                     HidDevice hDevice = tempList[i];
                     VidPidInfo metainfo = knownDevices.Single(x => x.vid == hDevice.Attributes.VendorId &&
                         x.pid == hDevice.Attributes.ProductId);
+                    AppLogger.LogToGui($"VCrashDiag: Inspecting candidate #{i + 1}/{devCount}. MetaName={metainfo.name} MetaType={metainfo.inputDevType} FeatureSet={metainfo.featureSet:F} Open={hDevice.IsOpen} Exclusive={hDevice.IsExclusive} VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false, true);
 
                     if (!metainfo.featureSet.HasFlag(VidPidFeatureSet.VendorDefinedDevice) &&
                         hDevice.Capabilities.UsagePage >= 0xFF00)
+                    {
+                        AppLogger.LogToGui($"VCrashDiag: Skipping candidate due to vendor-defined usage page. UsagePage=0x{hDevice.Capabilities.UsagePage:X} Path={hDevice.DevicePath}", false, true);
                         continue; // Ignore devices using Vendor-Defined HID Usage Pages (expected to ignore the Nacon Revolution Pro programming interface)
+                    }
                     else if (DevicePaths.Contains(hDevice.DevicePath))
+                    {
+                        AppLogger.LogToGui($"VCrashDiag: Skipping candidate because path is already open. Path={hDevice.DevicePath}", false, true);
                         continue; // BT/USB endpoint already open once
+                    }
 
                     if (!hDevice.IsOpen)
                     {
@@ -427,6 +448,7 @@ public static void findControllers()
                         }
 
                         bool validSerial = !serial.Equals(DS4Device.BLANK_SERIAL);
+                        AppLogger.LogToGui($"VCrashDiag: Candidate serial read. ValidSerial={validSerial} Serial={serial} MetaType={metainfo.inputDevType} Connection={metainfo.checkConnection(hDevice)} Path={hDevice.DevicePath}", false, true);
                         bool newdev = true;
                         if (validSerial && deviceSerials.Contains(serial))
                         {
@@ -453,17 +475,20 @@ public static void findControllers()
                             else
                             {
                                 // Using shared mode. Serial already exists. Ignore device
+                                AppLogger.LogToGui($"VCrashDiag: Skipping candidate because serial already exists. Serial={serial} Path={hDevice.DevicePath}", false, true);
                                 newdev = false;
                             }
                         }
 
                         if (newdev && validSerial)
                         {
+                            AppLogger.LogToGui($"VCrashDiag: Creating input device. Type={metainfo.inputDevType} Name={metainfo.name} Serial={serial} Path={hDevice.DevicePath}", false, true);
                             DS4Device ds4Device = InputDeviceFactory.CreateDevice(metainfo.inputDevType, hDevice, metainfo.name, metainfo.featureSet);
                             //DS4Device ds4Device = new DS4Device(hDevice, metainfo.name, metainfo.featureSet);
                             if (ds4Device == null)
                             {
                                 // No compatible device type was found. Skip
+                                AppLogger.LogToGui($"VCrashDiag: InputDeviceFactory returned null. Type={metainfo.inputDevType} Name={metainfo.name} Path={hDevice.DevicePath}", false, true);
                                 continue;
                             }
 

From bd542752ad5b5a0923f160d6daecb3b6eb06d016 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Mon, 8 Jun 2026 09:35:56 -0500
Subject: [PATCH 17/47] Fix virtual crash diagnostic build

---
 DS4Windows/DS4Control/OutputSlotManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DS4Windows/DS4Control/OutputSlotManager.cs b/DS4Windows/DS4Control/OutputSlotManager.cs
index 6a410d3..0c0cf1c 100644
--- a/DS4Windows/DS4Control/OutputSlotManager.cs
+++ b/DS4Windows/DS4Control/OutputSlotManager.cs
@@ -113,7 +113,7 @@ public void Stop(bool immediate = false)
         public OutputDevice AllocateController(OutContType contType, ViGEmClient client)
         {
             OutputDevice outputDevice = null;
-            AppLogger.LogToGui($"VCrashDiag: AllocateController enter. RequestedType={contType} ViGEmVersion={Global.vigemBusVersion} SupportedViGEm={Global.IsRunningSupportedViGEmBus()}", false, true);
+            AppLogger.LogToGui($"VCrashDiag: AllocateController enter. RequestedType={contType} ViGEmVersion={Global.vigembusVersion} SupportedViGEm={Global.IsRunningSupportedViGEmBus()}", false, true);
             switch (contType)
             {
                 case OutContType.X360:

From 5cbaed67ce9938151ad444a1712625fc08508177 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Mon, 8 Jun 2026 14:54:23 -0500
Subject: [PATCH 18/47] Trace virtual DS4 acceptance decisions

---
 DS4Windows/DS4Control/ScpUtil.cs    | 12 ++++++++++++
 DS4Windows/DS4Library/DS4Devices.cs | 29 ++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index cddaba8..117217d 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -1370,12 +1370,19 @@ public static bool CheckIfVirtualDevice(string devicePath)
         {
             bool result = false;
             bool excludeMatchFound = false;
+            List<string> traceParts = null;
+            if (devicePath != null &&
+                devicePath.IndexOf("vid_054c&pid_05c4", StringComparison.OrdinalIgnoreCase) >= 0)
+            {
+                traceParts = new List<string>();
+            }
 
             var instanceId = GetInstanceIdFromDevicePath(devicePath);
             var testInstanceId = instanceId;
             while (!string.IsNullOrEmpty(testInstanceId))
             {
                 var hardwareIds = GetStringArrayDeviceProperty(testInstanceId, NativeMethods.DEVPKEY_Device_HardwareIds);
+                traceParts?.Add($"{testInstanceId} [{(hardwareIds != null ? string.Join(",", hardwareIds) : "<no-hwids>")}]");
                 if (hardwareIds != null)
                 {
                     // hardware IDs of root hubs/controllers that emit supported virtual devices as sources
@@ -1412,6 +1419,11 @@ public static bool CheckIfVirtualDevice(string devicePath)
                 result = true;
             }
 
+            if (traceParts != null)
+            {
+                AppLogger.LogToGui($"VCrashDiag: CheckIfVirtualDevice result={result} Excluded={excludeMatchFound} TerminalInstance={testInstanceId} Path={devicePath} Trace={string.Join(" -> ", traceParts)}", false);
+            }
+
             return result;
         }
 
diff --git a/DS4Windows/DS4Library/DS4Devices.cs b/DS4Windows/DS4Library/DS4Devices.cs
index 1a4329d..c6ae25e 100644
--- a/DS4Windows/DS4Library/DS4Devices.cs
+++ b/DS4Windows/DS4Library/DS4Devices.cs
@@ -232,7 +232,9 @@ private static HashSet<string> SnapshotVirtualDS4Paths()
         // in one of our own. Call RegisterOwnVirtualDS4 with this snapshot right after.
         public static HashSet<string> SnapshotBeforeOwnVirtualDS4()
         {
-            return SnapshotVirtualDS4Paths();
+            HashSet<string> before = SnapshotVirtualDS4Paths();
+            AppLogger.LogToGui($"VCrashDiag: Own virtual DS4 snapshot before connect. Count={before.Count} Paths={string.Join(" || ", before)}", false);
+            return before;
         }
 
         // Any virtual DS4 that appears after our Connect() call, and was not present in
@@ -245,6 +247,7 @@ public static void RegisterOwnVirtualDS4(HashSet<string> beforePaths)
             for (int attempt = 0; attempt < 10 && !foundNew; attempt++)
             {
                 after = SnapshotVirtualDS4Paths();
+                AppLogger.LogToGui($"VCrashDiag: Own virtual DS4 register attempt {attempt + 1}. BeforeCount={(beforePaths?.Count ?? 0)} AfterCount={after.Count} Paths={string.Join(" || ", after)}", false);
                 foreach (string p in after)
                 {
                     if (beforePaths == null || !beforePaths.Contains(p))
@@ -265,10 +268,12 @@ public static void RegisterOwnVirtualDS4(HashSet<string> beforePaths)
                     if (beforePaths == null || !beforePaths.Contains(p))
                     {
                         ownVirtualDS4Paths.Add(p);
+                        AppLogger.LogToGui($"VCrashDiag: Registered own virtual DS4 path. Path={p}", false);
                     }
                 }
                 // Drop entries for devices that are no longer present (unplugged outputs).
                 ownVirtualDS4Paths.RemoveWhere(p => !after.Contains(p));
+                AppLogger.LogToGui($"VCrashDiag: Own virtual DS4 registry now. Count={ownVirtualDS4Paths.Count} Paths={string.Join(" || ", ownVirtualDS4Paths)}", false);
             }
         }
 
@@ -287,20 +292,25 @@ private static bool IsRealDS4(HidDevice hDevice)
             // mode. This is what breaks the Moonlight + DS4-output feedback loop.
             if (IsOwnVirtualDevice(hDevice.DevicePath))
             {
-                AppLogger.LogToGui($"VCrashDiag: Rejecting own virtual DS4 output as input. VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false, true);
+                AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision=False Reason=OwnVirtualOutput VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false);
                 return false;
             }
 
             bool isVirtualDevice = Global.CheckIfVirtualDevice(hDevice.DevicePath);
-            AppLogger.LogToGui($"VCrashDiag: Evaluating possible DS4 input. UseMoonlight={Global.UseMoonlight} AdvancedMoonlight={Global.UseAdvancedMoonlight} IsVirtual={isVirtualDevice} VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} UsagePage=0x{hDevice.Capabilities.UsagePage:X} Usage=0x{hDevice.Capabilities.Usage:X} Path={hDevice.DevicePath}", false, true);
+            AppLogger.LogToGui($"VCrashDiag: IsRealDS4 evaluate. UseMoonlight={Global.UseMoonlight} AdvancedMoonlight={Global.UseAdvancedMoonlight} IsVirtual={isVirtualDevice} OwnVirtual={IsOwnVirtualDevice(hDevice.DevicePath)} VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} UsagePage=0x{hDevice.Capabilities.UsagePage:X} Usage=0x{hDevice.Capabilities.Usage:X} Path={hDevice.DevicePath}", false);
 
-            if (!Global.UseMoonlight) return !isVirtualDevice;
+            if (!Global.UseMoonlight)
+            {
+                bool decision = !isVirtualDevice;
+                AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision={decision} Reason=MoonlightDisabled IsVirtual={isVirtualDevice} Path={hDevice.DevicePath}", false);
+                return decision;
+            }
             if (!Global.UseAdvancedMoonlight)
             {
                 // this approach should work on most devices, but not on my pc for some reason
                 if (hDevice.Attributes.VendorId == 1356 && hDevice.Attributes.ProductId == 1476)
                 {
-                    AppLogger.LogToGui("VCrashDiag: Accepting Moonlight virtual DS4 by VID/PID with basic Moonlight support.", false, true);
+                    AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision=True Reason=BasicMoonlightKnownVidPid Path={hDevice.DevicePath}", false);
                     return true;
                 }
             }
@@ -320,15 +330,16 @@ private static bool IsRealDS4(HidDevice hDevice)
                     if (DetectNewControllers)
                     {
                         DetectNewControllers = false;
-                        AppLogger.LogToGui("VCrashDiag: Accepting Moonlight virtual DS4 by VID/PID with advanced Moonlight cooldown.", false, true);
+                        AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision=True Reason=AdvancedMoonlightKnownVidPidCooldownOpen Path={hDevice.DevicePath}", false);
                         return true;
                     }
-                    AppLogger.LogToGui($"VCrashDiag: Rejecting Moonlight virtual DS4 during advanced Moonlight cooldown. DetectNewControllers={DetectNewControllers}", false, true);
+                    AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision={DetectNewControllers} Reason=AdvancedMoonlightKnownVidPidCooldownClosed DetectNewControllers={DetectNewControllers} Path={hDevice.DevicePath}", false);
                     return DetectNewControllers;
                 }
             }
-            AppLogger.LogToGui($"VCrashDiag: Default DS4 input decision={!isVirtualDevice} for VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId}", false, true);
-            return !isVirtualDevice;
+            bool defaultDecision = !isVirtualDevice;
+            AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision={defaultDecision} Reason=DefaultVirtualFilter IsVirtual={isVirtualDevice} VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false);
+            return defaultDecision;
         }
 
         // Enumerates ds4 controllers in the system

From 760e694ef58f6621695b95ad850ade753448b81f Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Mon, 8 Jun 2026 22:22:33 -0500
Subject: [PATCH 19/47] Harden virtual DS4 output registration race

---
 DS4Windows/DS4Control/OutputSlotManager.cs | 17 +++++++-
 DS4Windows/DS4Library/DS4Devices.cs        | 46 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/DS4Windows/DS4Control/OutputSlotManager.cs b/DS4Windows/DS4Control/OutputSlotManager.cs
index 0c0cf1c..002519e 100644
--- a/DS4Windows/DS4Control/OutputSlotManager.cs
+++ b/DS4Windows/DS4Control/OutputSlotManager.cs
@@ -174,6 +174,7 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
                     if (contType == OutContType.DS4 && Global.UseMoonlight)
                     {
                         beforeVirtualDS4 = DS4Devices.SnapshotBeforeOwnVirtualDS4();
+                        DS4Devices.BeginOwnVirtualDS4Connect();
                     }
 
                     try
@@ -187,13 +188,25 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
                         // Leave task immediately if connect call failed
                         //queuedTasks--;
                         ViGEmFailure?.Invoke(this, e.ErrorCode);
+                        if (beforeVirtualDS4 != null)
+                        {
+                            DS4Devices.EndOwnVirtualDS4Connect();
+                        }
+
                         return;
                     }
 
                     if (beforeVirtualDS4 != null)
                     {
-                        DS4Devices.RegisterOwnVirtualDS4(beforeVirtualDS4);
-                        AppLogger.LogToGui($"VCrashDiag: Registered own virtual DS4 after connect. Slot={slot + 1} Type={contType}", false, true);
+                        try
+                        {
+                            DS4Devices.RegisterOwnVirtualDS4(beforeVirtualDS4);
+                            AppLogger.LogToGui($"VCrashDiag: Registered own virtual DS4 after connect. Slot={slot + 1} Type={contType}", false, true);
+                        }
+                        finally
+                        {
+                            DS4Devices.EndOwnVirtualDS4Connect();
+                        }
                     }
 
                     if (contType == OutContType.X360)
diff --git a/DS4Windows/DS4Library/DS4Devices.cs b/DS4Windows/DS4Library/DS4Devices.cs
index c6ae25e..b6b4ef9 100644
--- a/DS4Windows/DS4Library/DS4Devices.cs
+++ b/DS4Windows/DS4Library/DS4Devices.cs
@@ -207,9 +207,12 @@ private static bool DetectNewControllers
         private static readonly object ownVirtualLock = new object();
         private static readonly HashSet<string> ownVirtualDS4Paths =
             new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private static int pendingOwnVirtualDS4Connects;
+        private static long pendingOwnVirtualDS4Timestamp;
 
         // ViGEm-created DS4 controllers report the Sony VID with one of these PIDs.
         private static readonly int[] VirtualDS4Pids = { 0x05C4, 0x09CC };
+        private static readonly TimeSpan OwnVirtualDS4PendingTimeout = TimeSpan.FromSeconds(2);
 
         private static HashSet<string> SnapshotVirtualDS4Paths()
         {
@@ -237,6 +240,41 @@ public static HashSet<string> SnapshotBeforeOwnVirtualDS4()
             return before;
         }
 
+        public static void BeginOwnVirtualDS4Connect()
+        {
+            lock (ownVirtualLock)
+            {
+                pendingOwnVirtualDS4Connects++;
+                pendingOwnVirtualDS4Timestamp = Stopwatch.GetTimestamp();
+            }
+        }
+
+        public static void EndOwnVirtualDS4Connect()
+        {
+            lock (ownVirtualLock)
+            {
+                if (pendingOwnVirtualDS4Connects > 0)
+                {
+                    pendingOwnVirtualDS4Connects--;
+                }
+            }
+        }
+
+        private static bool IsOwnVirtualDS4ConnectPending()
+        {
+            lock (ownVirtualLock)
+            {
+                if (pendingOwnVirtualDS4Connects <= 0)
+                {
+                    return false;
+                }
+
+                long elapsed = Stopwatch.GetTimestamp() - pendingOwnVirtualDS4Timestamp;
+                long timeoutTicks = (long)(OwnVirtualDS4PendingTimeout.TotalSeconds * Stopwatch.Frequency);
+                return elapsed < timeoutTicks;
+            }
+        }
+
         // Any virtual DS4 that appears after our Connect() call, and was not present in
         // beforePaths, is one we just created -> record it so input detection skips it.
         public static void RegisterOwnVirtualDS4(HashSet<string> beforePaths)
@@ -299,6 +337,14 @@ private static bool IsRealDS4(HidDevice hDevice)
             bool isVirtualDevice = Global.CheckIfVirtualDevice(hDevice.DevicePath);
             AppLogger.LogToGui($"VCrashDiag: IsRealDS4 evaluate. UseMoonlight={Global.UseMoonlight} AdvancedMoonlight={Global.UseAdvancedMoonlight} IsVirtual={isVirtualDevice} OwnVirtual={IsOwnVirtualDevice(hDevice.DevicePath)} VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} UsagePage=0x{hDevice.Capabilities.UsagePage:X} Usage=0x{hDevice.Capabilities.Usage:X} Path={hDevice.DevicePath}", false);
 
+            if (isVirtualDevice && hDevice.Attributes.VendorId == SONY_VID &&
+                VirtualDS4Pids.Contains(hDevice.Attributes.ProductId) &&
+                IsOwnVirtualDS4ConnectPending())
+            {
+                AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision=False Reason=OwnVirtualOutputPendingRegistration VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false);
+                return false;
+            }
+
             if (!Global.UseMoonlight)
             {
                 bool decision = !isVirtualDevice;

From 32ee4865b3b35e7666765c31a94a4758ae813994 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Mon, 8 Jun 2026 22:26:26 -0500
Subject: [PATCH 20/47] Remove virtual controller diagnostic logging

---
 DS4Windows/DS4Control/ControlService.cs    | 19 +-----------
 DS4Windows/DS4Control/OutputSlotManager.cs | 19 ------------
 DS4Windows/DS4Control/ScpUtil.cs           | 34 ----------------------
 DS4Windows/DS4Library/DS4Devices.cs        | 21 +------------
 4 files changed, 2 insertions(+), 91 deletions(-)

diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 1a0b37a..53da5b8 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -724,8 +724,6 @@ public bool CheckForSupportedDevice(HidDevice device, VidPidInfo metaInfo)
                     break;
             }
 
-            bool isVirtual = Global.CheckIfVirtualDevice(device.DevicePath);
-            LogDebug($"VCrashDiag: Support filter result. Supported={result} Type={metaInfo.inputDevType} Name={metaInfo.name} FeatureSet={metaInfo.featureSet:F} IsVirtual={isVirtual} UseMoonlight={Global.UseMoonlight} AdvancedMoonlight={Global.UseAdvancedMoonlight} VID={device.Attributes.VendorHexId} PID={device.Attributes.ProductHexId} UsagePage=0x{device.Capabilities.UsagePage:X} Usage=0x{device.Capabilities.Usage:X} Path={device.DevicePath}");
             return result;
         }
 
@@ -1497,13 +1495,11 @@ public void DetachUnboundOutDev(OutSlotDevice slotDevice)
         public void PluginOutDev(int index, DS4Device device)
         {
             OutContType contType = Global.OutContType[index];
-            LogDebug($"VCrashDiag: PluginOutDev enter. Controller={index + 1} DesiredOut={contType} UseDInputOnly={useDInputOnly[index]} GlobalDInputOnly={getDInputOnly(index)} ActiveOut={activeOutDevType[index]} ExistingOut={(outputDevices[index]?.GetDeviceType() ?? "<none>")} Device={device.DisplayName} Type={device.DeviceType} Serial={device.MacAddress} Synced={device.isSynced()} Alive={device.IsAlive()} Path={device.HidDevice?.DevicePath}");
 
             OutSlotDevice slotDevice = null;
             if (!getDInputOnly(index))
             {
                 slotDevice = outputslotMan.FindExistUnboundSlotType(contType);
-                LogDebug($"VCrashDiag: Existing unbound slot lookup. Controller={index + 1} DesiredOut={contType} FoundSlot={(slotDevice != null ? (slotDevice.Index + 1).ToString() : "<none>")}");
             }
 
             if (useDInputOnly[index])
@@ -1516,12 +1512,10 @@ public void PluginOutDev(int index, DS4Device device)
                     if (slotDevice == null)
                     {
                         slotDevice = outputslotMan.FindOpenSlot();
-                        LogDebug($"VCrashDiag: X360 open slot lookup. Controller={index + 1} FoundSlot={(slotDevice != null ? (slotDevice.Index + 1).ToString() : "<none>")}");
                         if (slotDevice != null)
                         {
                             Xbox360OutDevice tempXbox = EstablishOutDevice(index, OutContType.X360)
                             as Xbox360OutDevice;
-                            LogDebug($"VCrashDiag: Established X360 output device. Controller={index + 1} OutputNull={tempXbox == null}");
                             //outputDevices[index] = tempXbox;
 
                             // Enable ViGem feedback callback handler only if lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
@@ -1553,7 +1547,6 @@ public void PluginOutDev(int index, DS4Device device)
                     {
                         slotDevice.CurrentInputBound = OutSlotDevice.InputBound.Bound;
                         Xbox360OutDevice tempXbox = slotDevice.OutputDevice as Xbox360OutDevice;
-                        LogDebug($"VCrashDiag: Reusing unbound X360 output slot. Controller={index + 1} Slot={slotDevice.Index + 1} OutputNull={tempXbox == null}");
 
                         // Enable ViGem feedback callback handler only if lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
                         if (Global.EnableOutputDataToDS4[index])
@@ -1584,12 +1577,10 @@ public void PluginOutDev(int index, DS4Device device)
                     if (slotDevice == null)
                     {
                         slotDevice = outputslotMan.FindOpenSlot();
-                        LogDebug($"VCrashDiag: DS4 open slot lookup. Controller={index + 1} FoundSlot={(slotDevice != null ? (slotDevice.Index + 1).ToString() : "<none>")}");
                         if (slotDevice != null)
                         {
                             DS4OutDevice tempDS4 = EstablishOutDevice(index, OutContType.DS4)
                             as DS4OutDevice;
-                            LogDebug($"VCrashDiag: Established DS4 output device. Controller={index + 1} OutputNull={tempDS4 == null} UseMoonlight={Global.UseMoonlight}");
 
                             // Enable ViGem feedback callback handler only if DS4 lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
                             if (Global.EnableOutputDataToDS4[index])
@@ -1620,7 +1611,6 @@ public void PluginOutDev(int index, DS4Device device)
                     {
                         slotDevice.CurrentInputBound = OutSlotDevice.InputBound.Bound;
                         DS4OutDevice tempDS4 = slotDevice.OutputDevice as DS4OutDevice;
-                        LogDebug($"VCrashDiag: Reusing unbound DS4 output slot. Controller={index + 1} Slot={slotDevice.Index + 1} OutputNull={tempDS4 == null}");
 
                         // Enable ViGem feedback callback handler only if lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
                         if (Global.EnableOutputDataToDS4[index])
@@ -1655,23 +1645,17 @@ public void PluginOutDev(int index, DS4Device device)
                 if (success && slotDevice.OutputDevice != null)
                 {
                     LogDebug($"Associated input controller #{index + 1} ({device.DisplayName}) to virtual {slotDevice.OutputDevice.GetDeviceType()} Controller in{(slotDevice.PermanentType != OutContType.None ? " permanent" : "")} output slot #{slotDevice.Index + 1}");
-                    LogDebug($"VCrashDiag: PluginOutDev success. Controller={index + 1} Slot={slotDevice.Index + 1} Output={slotDevice.OutputDevice.GetDeviceType()} Reserve={slotDevice.CurrentReserveStatus} Attach={slotDevice.CurrentAttachedStatus} InputBound={slotDevice.CurrentInputBound}");
                     useDInputOnly[index] = false;
                 }
                 else
                 {
-                    LogDebug($"VCrashDiag: PluginOutDev did not associate output. Controller={index + 1} Success={success} SlotNull={slotDevice == null} SlotOutputNull={slotDevice?.OutputDevice == null}");
+                    LogDebug("Failed. No output device was associated");
                 }
             }
-            else
-            {
-                LogDebug($"VCrashDiag: PluginOutDev skipped because useDInputOnly is false. Controller={index + 1} ExistingOut={(outputDevices[index]?.GetDeviceType() ?? "<none>")}");
-            }
         }
 
         public void UnplugOutDev(int index, DS4Device device, bool immediate = false, bool force = false)
         {
-            LogDebug($"VCrashDiag: UnplugOutDev enter. Controller={index + 1} Immediate={immediate} Force={force} UseDInputOnly={useDInputOnly[index]} ActiveOut={activeOutDevType[index]} ExistingOut={(outputDevices[index]?.GetDeviceType() ?? "<none>")} Device={device.DisplayName} Type={device.DeviceType} Serial={device.MacAddress} Synced={device.isSynced()} Alive={device.IsAlive()} Path={device.HidDevice?.DevicePath}");
             if (!useDInputOnly[index])
             {
                 //OutContType contType = Global.OutContType[index];
@@ -1681,7 +1665,6 @@ public void UnplugOutDev(int index, DS4Device device, bool immediate = false, bo
                 {
                     string tempType = dev.GetDeviceType();
                     LogDebug($"Disassociated virtual {tempType} Controller in{(slotDevice.CurrentReserveStatus == OutSlotDevice.ReserveStatus.Permanent ? " permanent" : "")} output slot #{slotDevice.Index + 1} from input controller #{index + 1} ({device.DisplayName})", false);
-                    LogDebug($"VCrashDiag: UnplugOutDev slot state. Controller={index + 1} Slot={slotDevice.Index + 1} Output={tempType} Reserve={slotDevice.CurrentReserveStatus} Attach={slotDevice.CurrentAttachedStatus} InputBound={slotDevice.CurrentInputBound}");
 
                     OutContType currentType = activeOutDevType[index];
                     outputDevices[index] = null;
diff --git a/DS4Windows/DS4Control/OutputSlotManager.cs b/DS4Windows/DS4Control/OutputSlotManager.cs
index 002519e..63724a0 100644
--- a/DS4Windows/DS4Control/OutputSlotManager.cs
+++ b/DS4Windows/DS4Control/OutputSlotManager.cs
@@ -113,7 +113,6 @@ public void Stop(bool immediate = false)
         public OutputDevice AllocateController(OutContType contType, ViGEmClient client)
         {
             OutputDevice outputDevice = null;
-            AppLogger.LogToGui($"VCrashDiag: AllocateController enter. RequestedType={contType} ViGEmVersion={Global.vigembusVersion} SupportedViGEm={Global.IsRunningSupportedViGEmBus()}", false, true);
             switch (contType)
             {
                 case OutContType.X360:
@@ -136,7 +135,6 @@ public OutputDevice AllocateController(OutContType contType, ViGEmClient client)
                     break;
             }
 
-            AppLogger.LogToGui($"VCrashDiag: AllocateController exit. RequestedType={contType} OutputNull={outputDevice == null} OutputType={(outputDevice?.GetDeviceType() ?? "<none>")}", false, true);
             return outputDevice;
         }
 
@@ -164,7 +162,6 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
             //Action tempAction = new Action(() =>
             {
                 int slot = FindEmptySlot();
-                AppLogger.LogToGui($"VCrashDiag: DeferredPlugin enter. InputIndex={inIdx} Display={inDisplayString} RequestedType={contType} OutputNull={outputDevice == null} EmptySlot={(slot != -1 ? (slot + 1).ToString() : "<none>")} UseMoonlight={Global.UseMoonlight}", false, true);
                 if (slot != -1)
                 {
                     // Only relevant when Virtual Controller (Moonlight) support is on and
@@ -179,12 +176,10 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
 
                     try
                     {
-                        AppLogger.LogToGui($"VCrashDiag: Connecting virtual output. Slot={slot + 1} Type={contType} OutputType={(outputDevice?.GetDeviceType() ?? "<none>")}", false, true);
                         outputDevice.Connect();
                     }
                     catch (Win32Exception e)
                     {
-                        AppLogger.LogToGui($"VCrashDiag: Virtual output connect failed. Slot={slot + 1} Type={contType} ErrorCode={e.ErrorCode} NativeErrorCode={e.NativeErrorCode} Message={e.Message}", true, true);
                         // Leave task immediately if connect call failed
                         //queuedTasks--;
                         ViGEmFailure?.Invoke(this, e.ErrorCode);
@@ -201,7 +196,6 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
                         try
                         {
                             DS4Devices.RegisterOwnVirtualDS4(beforeVirtualDS4);
-                            AppLogger.LogToGui($"VCrashDiag: Registered own virtual DS4 after connect. Slot={slot + 1} Type={contType}", false, true);
                         }
                         finally
                         {
@@ -229,11 +223,6 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
                         outputSlots[slot].CurrentInputBound = OutSlotDevice.InputBound.Bound;
                     }
                     SlotAssigned?.Invoke(this, slot, outputSlots[slot]);
-                    AppLogger.LogToGui($"VCrashDiag: DeferredPlugin exit. Slot={slot + 1} InputIndex={inIdx} Attach={outputSlots[slot].CurrentAttachedStatus} Bound={outputSlots[slot].CurrentInputBound} Reserve={outputSlots[slot].CurrentReserveStatus}", false, true);
-                }
-                else
-                {
-                    AppLogger.LogToGui($"VCrashDiag: DeferredPlugin found no empty slot. InputIndex={inIdx} RequestedType={contType}", false, true);
                 }
             };
 
@@ -250,16 +239,13 @@ public void DeferredRemoval(OutputDevice outputDevice, int inIdx,
             //queuedTasks++;
 
             {
-                AppLogger.LogToGui($"VCrashDiag: DeferredRemoval enter. InputIndex={inIdx} OutputNull={outputDevice == null} OutputType={(outputDevice?.GetDeviceType() ?? "<none>")} Immediate={immediate}", false, true);
                 if (revDeviceDict.TryGetValue(outputDevice, out int slot))
                 {
-                    AppLogger.LogToGui($"VCrashDiag: DeferredRemoval slot found. Slot={slot + 1} OutputType={outputDevice.GetDeviceType()} Attach={outputSlots[slot].CurrentAttachedStatus} Bound={outputSlots[slot].CurrentInputBound} Reserve={outputSlots[slot].CurrentReserveStatus}", false, true);
                     //int slot = revDeviceDict[outputDevice];
                     outputDevices[slot] = null;
                     deviceDict.Remove(slot);
                     revDeviceDict.Remove(outputDevice);
 
-                    AppLogger.LogToGui($"VCrashDiag: Removing feedback and disconnecting output. Slot={slot + 1} OutputType={outputDevice.GetDeviceType()}", false, true);
                     outputDevice.RemoveFeedbacks();
                     outputDevice.Disconnect();
 
@@ -271,17 +257,12 @@ public void DeferredRemoval(OutputDevice outputDevice, int inIdx,
                     outputSlots[slot].DetachDevice();
                     SlotUnassigned?.Invoke(this, slot, outputSlots[slot]);
                     AppLogger.LogToGui($"Unplugging virtual {outputDevice.GetDeviceType()} Controller from output slot #{slot + 1}",false);
-                    AppLogger.LogToGui($"VCrashDiag: DeferredRemoval exit. Slot={slot + 1} InputIndex={inIdx}", false, true);
 
                     //if (!immediate)
                     //{
                         //    Task.Delay(DELAY_TIME).Wait();
                     //}
                 }
-                else
-                {
-                    AppLogger.LogToGui($"VCrashDiag: DeferredRemoval could not find output in reverse dictionary. InputIndex={inIdx} OutputType={(outputDevice?.GetDeviceType() ?? "<none>")}", false, true);
-                }
             };
 
             //queuedTasks--;
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index 117217d..fdcc9a2 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -1370,19 +1370,11 @@ public static bool CheckIfVirtualDevice(string devicePath)
         {
             bool result = false;
             bool excludeMatchFound = false;
-            List<string> traceParts = null;
-            if (devicePath != null &&
-                devicePath.IndexOf("vid_054c&pid_05c4", StringComparison.OrdinalIgnoreCase) >= 0)
-            {
-                traceParts = new List<string>();
-            }
-
             var instanceId = GetInstanceIdFromDevicePath(devicePath);
             var testInstanceId = instanceId;
             while (!string.IsNullOrEmpty(testInstanceId))
             {
                 var hardwareIds = GetStringArrayDeviceProperty(testInstanceId, NativeMethods.DEVPKEY_Device_HardwareIds);
-                traceParts?.Add($"{testInstanceId} [{(hardwareIds != null ? string.Join(",", hardwareIds) : "<no-hwids>")}]");
                 if (hardwareIds != null)
                 {
                     // hardware IDs of root hubs/controllers that emit supported virtual devices as sources
@@ -1419,11 +1411,6 @@ public static bool CheckIfVirtualDevice(string devicePath)
                 result = true;
             }
 
-            if (traceParts != null)
-            {
-                AppLogger.LogToGui($"VCrashDiag: CheckIfVirtualDevice result={result} Excluded={excludeMatchFound} TerminalInstance={testInstanceId} Path={devicePath} Trace={string.Join(" -> ", traceParts)}", false);
-            }
-
             return result;
         }
 
@@ -5402,9 +5389,6 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
             else
                 profilepath = propath;
 
-            DS4Device diagDevice = device < ControlService.CURRENT_DS4_CONTROLLER_LIMIT ? control.DS4Controllers[device] : null;
-            AppLogger.LogToGui($"VCrashDiag: LoadProfileNew enter. Controller={device + 1} ProfileName={profilePath[device]} ProfilePath={profilepath} Exists={File.Exists(profilepath)} LaunchProgram={launchprogram} XInputChange={xinputChange} PostLoad={postLoad} CurrentOut={Global.activeOutDevType[device]} DesiredOut={outputDevType[device]} DInputOnly={dinputOnly[device]} DeviceNull={diagDevice == null} Device={(diagDevice?.DisplayName ?? "<none>")} Type={(diagDevice?.DeviceType.ToString() ?? "<none>")} Serial={(diagDevice?.MacAddress ?? "<none>")} Synced={(diagDevice?.isSynced().ToString() ?? "<none>")} Alive={(diagDevice?.IsAlive().ToString() ?? "<none>")} Path={(diagDevice?.HidDevice?.DevicePath ?? "<none>")}", false, true);
-
             if (File.Exists(profilepath))
             {
                 string profileXml = string.Empty;
@@ -5455,7 +5439,6 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                 // Reset some Mapping properties before attempting to load different
                 // profile
                 control.PreLoadReset(device);
-                AppLogger.LogToGui($"VCrashDiag: LoadProfileNew reset complete. Controller={device + 1} OldOut={oldContType}", false, true);
 
                 profileActions[device].Clear();
                 foreach (DS4ControlSettings dcs in ds4settings[device])
@@ -5470,18 +5453,15 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                     ProfileDTO dto = serializer.Deserialize(sr) as ProfileDTO;
                     dto.DeviceIndex = device;
                     dto.MapTo(this);
-                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew DTO mapped. Controller={device + 1} ProfileName={profilePath[device]} DesiredOut={outputDevType[device]} DInputOnly={dinputOnly[device]} EnableOutputData={enableOutputDataToDS4[device]} Actions={profileActions[device].Count}", false, true);
                 }
                 catch (InvalidOperationException e)
                 {
                     AppLogger.LogToGui($"Failed to load {profilepath}. {e.InnerException?.Message ?? e.Message}", false);
-                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew deserialize failure. Controller={device + 1} Exception={e}", true, true);
                     loaded = false;
                 }
                 catch (XmlException e)
                 {
                     AppLogger.LogToGui($"Failed to load {profilepath}. Invalid XML. {e.InnerException?.Message ?? e.Message}", false);
-                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew XML failure. Controller={device + 1} Exception={e}", true, true);
                     loaded = false;
                 }
 
@@ -5507,7 +5487,6 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                 {
                     CheckOldDevicestatus(device, control, oldContType,
                         out xinputPlug, out xinputStatus);
-                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew output status check. Controller={device + 1} OldOut={oldContType} NewOut={outputDevType[device]} XInputStatus={xinputStatus} XInputPlug={xinputPlug} OldDInputOnly={Global.useDInputOnly[device]} NewDInputOnly={dinputOnly[device]}", false, true);
                 }
 
                 CacheProfileCustomsFlags(device);
@@ -5579,9 +5558,7 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                 // options to device instance
                 if (postLoad && device < Global.MAX_DS4_CONTROLLER_COUNT)
                 {
-                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew before PostLoadSnippet. Controller={device + 1} XInputStatus={xinputStatus} XInputPlug={xinputPlug}", false, true);
                     PostLoadSnippet(device, control, xinputStatus, xinputPlug);
-                    AppLogger.LogToGui($"VCrashDiag: LoadProfileNew after PostLoadSnippet. Controller={device + 1}", false, true);
                 }
 
                 // Migration was performed. Save new XML schema in file
@@ -5593,7 +5570,6 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
             }
             else
             {
-                AppLogger.LogToGui($"VCrashDiag: LoadProfileNew missing profile path. Controller={device + 1} ProfilePath={profilepath}", true, true);
                 loaded = false;
                 ResetProfile(device);
                 ResetMouseProperties(device, control);
@@ -5629,7 +5605,6 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                 }
             }
 
-            AppLogger.LogToGui($"VCrashDiag: LoadProfileNew exit. Controller={device + 1} Loaded={loaded} ProfileName={profilePath[device]} DesiredOut={outputDevType[device]} DInputOnly={dinputOnly[device]}", false, true);
             return loaded;
         }
 
@@ -10543,7 +10518,6 @@ private void CheckOldDevicestatus(int device, ControlService control,
                 bool exists = tempBool = (tempDevice != null);
                 bool synced = tempBool = exists ? tempDevice.isSynced() : false;
                 bool isAlive = tempBool = exists ? tempDevice.IsAlive() : false;
-                AppLogger.LogToGui($"VCrashDiag: CheckOldDevicestatus. Controller={device + 1} Exists={exists} Synced={synced} Alive={isAlive} OldOut={oldContType} NewOut={outputDevType[device]} OldDInputOnly={oldUseDInputOnly} NewDInputOnly={dinputOnly[device]}", false, true);
                 if (dinputOnly[device] != oldUseDInputOnly)
                 {
                     if (dinputOnly[device] == true)
@@ -10569,12 +10543,10 @@ private void CheckOldDevicestatus(int device, ControlService control,
         private void PostLoadSnippet(int device, ControlService control, bool xinputStatus, bool xinputPlug)
         {
             DS4Device tempDev = control.DS4Controllers[device];
-            AppLogger.LogToGui($"VCrashDiag: PostLoadSnippet enter. Controller={device + 1} DeviceNull={tempDev == null} XInputStatus={xinputStatus} XInputPlug={xinputPlug} DesiredOut={outputDevType[device]} DInputOnly={dinputOnly[device]} ExistingOut={(control.outputDevices[device]?.GetDeviceType() ?? "<none>")}", false, true);
             if (tempDev != null && tempDev.isSynced())
             {
                 tempDev.queueEvent(() =>
                 {
-                    AppLogger.LogToGui($"VCrashDiag: PostLoad queued action start. Controller={device + 1} Device={tempDev.DisplayName} Type={tempDev.DeviceType} Serial={tempDev.MacAddress} Synced={tempDev.isSynced()} Alive={tempDev.IsAlive()} XInputStatus={xinputStatus} XInputPlug={xinputPlug} ExistingOut={(control.outputDevices[device]?.GetDeviceType() ?? "<none>")}", false, true);
                     //tempDev.setIdleTimeout(idleDisconnectTimeout[device]);
                     //tempDev.setBTPollRate(btPollRate[device]);
                     if (xinputStatus && tempDev.PrimaryDevice)
@@ -10584,21 +10556,18 @@ private void PostLoadSnippet(int device, ControlService control, bool xinputStat
                             OutputDevice tempOutDev = control.outputDevices[device];
                             if (tempOutDev != null)
                             {
-                                AppLogger.LogToGui($"VCrashDiag: PostLoad queued action unplug before replug. Controller={device + 1} Output={tempOutDev.GetDeviceType()}", false, true);
                                 tempOutDev = null;
                                 //Global.activeOutDevType[device] = OutContType.None;
                                 control.UnplugOutDev(device, tempDev);
                             }
 
                             OutContType tempContType = outputDevType[device];
-                            AppLogger.LogToGui($"VCrashDiag: PostLoad queued action plugin after profile change. Controller={device + 1} DesiredOut={tempContType}", false, true);
                             control.PluginOutDev(device, tempDev);
                             //Global.useDInputOnly[device] = false;
                         }
                         else
                         {
                             //Global.activeOutDevType[device] = OutContType.None;
-                            AppLogger.LogToGui($"VCrashDiag: PostLoad queued action unplug only after profile change. Controller={device + 1}", false, true);
                             control.UnplugOutDev(device, tempDev);
                         }
                     }
@@ -10606,16 +10575,13 @@ private void PostLoadSnippet(int device, ControlService control, bool xinputStat
                     //tempDev.RumbleAutostopTime = rumbleAutostopTime[device];
                     //tempDev.setRumble(0, 0);
                     //tempDev.LightBarColor = Global.getMainColor(device);
-                    AppLogger.LogToGui($"VCrashDiag: PostLoad queued action before CheckProfileOptions. Controller={device + 1}", false, true);
                     control.CheckProfileOptions(device, tempDev, true);
-                    AppLogger.LogToGui($"VCrashDiag: PostLoad queued action end. Controller={device + 1} ExistingOut={(control.outputDevices[device]?.GetDeviceType() ?? "<none>")}", false, true);
                 });
 
                 //Program.rootHub.touchPad[device]?.ResetTrackAccel(trackballFriction[device]);
             }
             else
             {
-                AppLogger.LogToGui($"VCrashDiag: PostLoadSnippet skipped because controller is null or not synced. Controller={device + 1}", false, true);
             }
         }
     }
diff --git a/DS4Windows/DS4Library/DS4Devices.cs b/DS4Windows/DS4Library/DS4Devices.cs
index b6b4ef9..69fc0dc 100644
--- a/DS4Windows/DS4Library/DS4Devices.cs
+++ b/DS4Windows/DS4Library/DS4Devices.cs
@@ -1,4 +1,4 @@
-/*
+/*
 DS4Windows
 Copyright (C) 2023  Travis Nickles
 
@@ -236,7 +236,6 @@ private static HashSet<string> SnapshotVirtualDS4Paths()
         public static HashSet<string> SnapshotBeforeOwnVirtualDS4()
         {
             HashSet<string> before = SnapshotVirtualDS4Paths();
-            AppLogger.LogToGui($"VCrashDiag: Own virtual DS4 snapshot before connect. Count={before.Count} Paths={string.Join(" || ", before)}", false);
             return before;
         }
 
@@ -285,7 +284,6 @@ public static void RegisterOwnVirtualDS4(HashSet<string> beforePaths)
             for (int attempt = 0; attempt < 10 && !foundNew; attempt++)
             {
                 after = SnapshotVirtualDS4Paths();
-                AppLogger.LogToGui($"VCrashDiag: Own virtual DS4 register attempt {attempt + 1}. BeforeCount={(beforePaths?.Count ?? 0)} AfterCount={after.Count} Paths={string.Join(" || ", after)}", false);
                 foreach (string p in after)
                 {
                     if (beforePaths == null || !beforePaths.Contains(p))
@@ -306,12 +304,10 @@ public static void RegisterOwnVirtualDS4(HashSet<string> beforePaths)
                     if (beforePaths == null || !beforePaths.Contains(p))
                     {
                         ownVirtualDS4Paths.Add(p);
-                        AppLogger.LogToGui($"VCrashDiag: Registered own virtual DS4 path. Path={p}", false);
                     }
                 }
                 // Drop entries for devices that are no longer present (unplugged outputs).
                 ownVirtualDS4Paths.RemoveWhere(p => !after.Contains(p));
-                AppLogger.LogToGui($"VCrashDiag: Own virtual DS4 registry now. Count={ownVirtualDS4Paths.Count} Paths={string.Join(" || ", ownVirtualDS4Paths)}", false);
             }
         }
 
@@ -330,25 +326,21 @@ private static bool IsRealDS4(HidDevice hDevice)
             // mode. This is what breaks the Moonlight + DS4-output feedback loop.
             if (IsOwnVirtualDevice(hDevice.DevicePath))
             {
-                AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision=False Reason=OwnVirtualOutput VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false);
                 return false;
             }
 
             bool isVirtualDevice = Global.CheckIfVirtualDevice(hDevice.DevicePath);
-            AppLogger.LogToGui($"VCrashDiag: IsRealDS4 evaluate. UseMoonlight={Global.UseMoonlight} AdvancedMoonlight={Global.UseAdvancedMoonlight} IsVirtual={isVirtualDevice} OwnVirtual={IsOwnVirtualDevice(hDevice.DevicePath)} VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} UsagePage=0x{hDevice.Capabilities.UsagePage:X} Usage=0x{hDevice.Capabilities.Usage:X} Path={hDevice.DevicePath}", false);
 
             if (isVirtualDevice && hDevice.Attributes.VendorId == SONY_VID &&
                 VirtualDS4Pids.Contains(hDevice.Attributes.ProductId) &&
                 IsOwnVirtualDS4ConnectPending())
             {
-                AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision=False Reason=OwnVirtualOutputPendingRegistration VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false);
                 return false;
             }
 
             if (!Global.UseMoonlight)
             {
                 bool decision = !isVirtualDevice;
-                AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision={decision} Reason=MoonlightDisabled IsVirtual={isVirtualDevice} Path={hDevice.DevicePath}", false);
                 return decision;
             }
             if (!Global.UseAdvancedMoonlight)
@@ -356,7 +348,6 @@ private static bool IsRealDS4(HidDevice hDevice)
                 // this approach should work on most devices, but not on my pc for some reason
                 if (hDevice.Attributes.VendorId == 1356 && hDevice.Attributes.ProductId == 1476)
                 {
-                    AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision=True Reason=BasicMoonlightKnownVidPid Path={hDevice.DevicePath}", false);
                     return true;
                 }
             }
@@ -376,15 +367,12 @@ private static bool IsRealDS4(HidDevice hDevice)
                     if (DetectNewControllers)
                     {
                         DetectNewControllers = false;
-                        AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision=True Reason=AdvancedMoonlightKnownVidPidCooldownOpen Path={hDevice.DevicePath}", false);
                         return true;
                     }
-                    AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision={DetectNewControllers} Reason=AdvancedMoonlightKnownVidPidCooldownClosed DetectNewControllers={DetectNewControllers} Path={hDevice.DevicePath}", false);
                     return DetectNewControllers;
                 }
             }
             bool defaultDecision = !isVirtualDevice;
-            AppLogger.LogToGui($"VCrashDiag: IsRealDS4 decision={defaultDecision} Reason=DefaultVirtualFilter IsVirtual={isVirtualDevice} VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false);
             return defaultDecision;
         }
 
@@ -429,17 +417,14 @@ public static void findControllers()
                     HidDevice hDevice = tempList[i];
                     VidPidInfo metainfo = knownDevices.Single(x => x.vid == hDevice.Attributes.VendorId &&
                         x.pid == hDevice.Attributes.ProductId);
-                    AppLogger.LogToGui($"VCrashDiag: Inspecting candidate #{i + 1}/{devCount}. MetaName={metainfo.name} MetaType={metainfo.inputDevType} FeatureSet={metainfo.featureSet:F} Open={hDevice.IsOpen} Exclusive={hDevice.IsExclusive} VID={hDevice.Attributes.VendorHexId} PID={hDevice.Attributes.ProductHexId} Path={hDevice.DevicePath}", false, true);
 
                     if (!metainfo.featureSet.HasFlag(VidPidFeatureSet.VendorDefinedDevice) &&
                         hDevice.Capabilities.UsagePage >= 0xFF00)
                     {
-                        AppLogger.LogToGui($"VCrashDiag: Skipping candidate due to vendor-defined usage page. UsagePage=0x{hDevice.Capabilities.UsagePage:X} Path={hDevice.DevicePath}", false, true);
                         continue; // Ignore devices using Vendor-Defined HID Usage Pages (expected to ignore the Nacon Revolution Pro programming interface)
                     }
                     else if (DevicePaths.Contains(hDevice.DevicePath))
                     {
-                        AppLogger.LogToGui($"VCrashDiag: Skipping candidate because path is already open. Path={hDevice.DevicePath}", false, true);
                         continue; // BT/USB endpoint already open once
                     }
 
@@ -505,7 +490,6 @@ public static void findControllers()
                         }
 
                         bool validSerial = !serial.Equals(DS4Device.BLANK_SERIAL);
-                        AppLogger.LogToGui($"VCrashDiag: Candidate serial read. ValidSerial={validSerial} Serial={serial} MetaType={metainfo.inputDevType} Connection={metainfo.checkConnection(hDevice)} Path={hDevice.DevicePath}", false, true);
                         bool newdev = true;
                         if (validSerial && deviceSerials.Contains(serial))
                         {
@@ -532,20 +516,17 @@ public static void findControllers()
                             else
                             {
                                 // Using shared mode. Serial already exists. Ignore device
-                                AppLogger.LogToGui($"VCrashDiag: Skipping candidate because serial already exists. Serial={serial} Path={hDevice.DevicePath}", false, true);
                                 newdev = false;
                             }
                         }
 
                         if (newdev && validSerial)
                         {
-                            AppLogger.LogToGui($"VCrashDiag: Creating input device. Type={metainfo.inputDevType} Name={metainfo.name} Serial={serial} Path={hDevice.DevicePath}", false, true);
                             DS4Device ds4Device = InputDeviceFactory.CreateDevice(metainfo.inputDevType, hDevice, metainfo.name, metainfo.featureSet);
                             //DS4Device ds4Device = new DS4Device(hDevice, metainfo.name, metainfo.featureSet);
                             if (ds4Device == null)
                             {
                                 // No compatible device type was found. Skip
-                                AppLogger.LogToGui($"VCrashDiag: InputDeviceFactory returned null. Type={metainfo.inputDevType} Name={metainfo.name} Path={hDevice.DevicePath}", false, true);
                                 continue;
                             }
 

From 0e8294f65851649cf6016da26cba5a6f141b59e8 Mon Sep 17 00:00:00 2001
From: Test <test@test.com>
Date: Tue, 9 Jun 2026 23:49:56 +0100
Subject: [PATCH 21/47] feat: add OpenRGB lightbar sync via embedded SDK server

---
 DS4Windows/DS4Control/ControlService.cs |  12 +
 DS4Windows/DS4Control/DS4LightBar.cs    |   7 +
 DS4Windows/DS4Control/OpenRGBServer.cs  | 326 ++++++++++++++++++++++++
 DS4Windows/DS4Control/ScpUtil.cs        |   4 +
 4 files changed, 349 insertions(+)
 create mode 100644 DS4Windows/DS4Control/OpenRGBServer.cs

diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 53da5b8..925912e 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -1719,6 +1719,15 @@ public bool Start(bool showlog = true)
 
                 UpdateHidHiddenAttributes();
 
+                if (Global.openRGBSyncEnabled)
+                {
+                    bool openRGBStarted = OpenRGBServer.Instance.Start(Global.openRGBServerPort);
+                    if (showlog)
+                        LogDebug(openRGBStarted
+                            ? $"OpenRGB server listening on port {Global.openRGBServerPort}"
+                            : $"OpenRGB server could not bind to port {Global.openRGBServerPort} - lightbar will use profile colour");
+                }
+
                 if (showlog)
                 {
                     LogDebug(DS4WinWPF.Properties.Resources.SearchingController);
@@ -1929,6 +1938,9 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false)
         {
             if (running)
             {
+                if (OpenRGBServer.Instance.IsRunning)
+                    OpenRGBServer.Instance.Stop();
+
                 running = false;
                 runHotPlug = false;
                 inServiceTask = true;
diff --git a/DS4Windows/DS4Control/DS4LightBar.cs b/DS4Windows/DS4Control/DS4LightBar.cs
index 03260d2..cd14c6b 100644
--- a/DS4Windows/DS4Control/DS4LightBar.cs
+++ b/DS4Windows/DS4Control/DS4LightBar.cs
@@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License
 using static System.Math;
 using static DS4Windows.Global;
 using System.Diagnostics;
+using DS4WinWPF.DS4Control;
 
 namespace DS4Windows
 {
@@ -324,6 +325,12 @@ public static void updateLightBar(DS4Device device, int deviceNum)
                     LightBarColor = color
                 };
                 */
+                if (Global.openRGBSyncEnabled &&
+                    OpenRGBServer.Instance.TryGetColor(deviceNum, out DS4Color openRGBColor))
+                {
+                    color = openRGBColor;
+                }
+
                 DS4LightbarState lightState = new DS4LightbarState
                 {
                     LightBarColor = color,
diff --git a/DS4Windows/DS4Control/OpenRGBServer.cs b/DS4Windows/DS4Control/OpenRGBServer.cs
new file mode 100644
index 0000000..3824234
--- /dev/null
+++ b/DS4Windows/DS4Control/OpenRGBServer.cs
@@ -0,0 +1,326 @@
+/*
+DS4Windows
+Copyright (C) 2023  Travis Nickles
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using DS4Windows;
+
+namespace DS4WinWPF.DS4Control
+{
+    // Lightweight OpenRGB SDK server (protocol v4).
+    //
+    // Add DS4Windows as a target in OpenRGB via Settings > SDK Client tab,
+    // entering host=localhost port=6743. DS4 controller slots appear as
+    // gamepad devices; OpenRGB can set lightbar colours which DS4LightBar
+    // reads via TryGetColor(slot, out color).
+    public sealed class OpenRGBServer : IDisposable
+    {
+        private static readonly Lazy<OpenRGBServer> _instance =
+            new Lazy<OpenRGBServer>(() => new OpenRGBServer());
+        public static OpenRGBServer Instance => _instance.Value;
+
+        private const int PROTOCOL_VERSION = 4;
+        private const int MAX_SLOTS = Global.MAX_DS4_CONTROLLER_COUNT;
+
+        private readonly DS4Color[] pendingColors  = new DS4Color[MAX_SLOTS];
+        private readonly bool[]     hasPendingColor = new bool[MAX_SLOTS];
+        private readonly object     colorLock       = new object();
+
+        private TcpListener listener;
+        private volatile bool running;
+
+        public bool IsRunning => running;
+
+        private OpenRGBServer() { }
+
+        public bool Start(int port = 6743)
+        {
+            if (running) Stop();
+            try
+            {
+                listener = new TcpListener(IPAddress.Any, port);
+                listener.Start();
+                running = true;
+                new Thread(AcceptLoop) { IsBackground = true, Name = "OpenRGBServerAccept" }.Start();
+                return true;
+            }
+            catch
+            {
+                listener = null;
+                return false;
+            }
+        }
+
+        public void Stop()
+        {
+            running = false;
+            try { listener?.Stop(); } catch { }
+            listener = null;
+            lock (colorLock)
+            {
+                for (int i = 0; i < MAX_SLOTS; i++)
+                    hasPendingColor[i] = false;
+            }
+        }
+
+        public bool TryGetColor(int slot, out DS4Color color)
+        {
+            if (slot < 0 || slot >= MAX_SLOTS || !running)
+            {
+                color = default;
+                return false;
+            }
+            lock (colorLock)
+            {
+                if (!hasPendingColor[slot])
+                {
+                    color = default;
+                    return false;
+                }
+                color = pendingColors[slot];
+                return true;
+            }
+        }
+
+        private void AcceptLoop()
+        {
+            while (running)
+            {
+                try
+                {
+                    TcpClient client = listener.AcceptTcpClient();
+                    new Thread(() => HandleClient(client))
+                    {
+                        IsBackground = true,
+                        Name = "OpenRGBServerClient"
+                    }.Start();
+                }
+                catch
+                {
+                    if (!running) break;
+                    Thread.Sleep(500);
+                }
+            }
+        }
+
+        private void HandleClient(TcpClient client)
+        {
+            try
+            {
+                client.ReceiveTimeout = 0;
+                using NetworkStream stream = client.GetStream();
+
+                while (running && client.Connected)
+                {
+                    byte[] header = ReadExact(stream, 16);
+                    if (header == null) break;
+
+                    if (header[0] != 'O' || header[1] != 'R' || header[2] != 'G' || header[3] != 'B')
+                        break;
+
+                    uint devIdx   = BitConverter.ToUInt32(header, 4);
+                    uint pktId    = BitConverter.ToUInt32(header, 8);
+                    uint dataSize = BitConverter.ToUInt32(header, 12);
+
+                    byte[] payload = dataSize > 0 ? ReadExact(stream, (int)dataSize) : Array.Empty<byte>();
+                    if (payload == null) break;
+
+                    ProcessPacket(stream, devIdx, pktId, payload);
+                }
+            }
+            catch { }
+            finally { client.Close(); }
+        }
+
+        private void ProcessPacket(NetworkStream stream, uint devIdx, uint pktId, byte[] payload)
+        {
+            switch (pktId)
+            {
+                case 0: // REQUEST_CONTROLLER_COUNT
+                    SendPacket(stream, 0, 0, BitConverter.GetBytes((uint)MAX_SLOTS));
+                    break;
+
+                case 1: // REQUEST_CONTROLLER_DATA
+                    if (devIdx < MAX_SLOTS)
+                    {
+                        DS4Color current;
+                        lock (colorLock)
+                            current = hasPendingColor[devIdx]
+                                ? pendingColors[devIdx]
+                                : new DS4Color(0, 0, 255);
+                        SendPacket(stream, devIdx, 1, BuildDeviceData((int)devIdx, current));
+                    }
+                    break;
+
+                case 40: // REQUEST_PROTOCOL_VERSION
+                    SendPacket(stream, 0, 40, BitConverter.GetBytes((uint)PROTOCOL_VERSION));
+                    break;
+
+                case 50: // SET_CLIENT_NAME
+                    break;
+
+                case 1050: // UPDATELEDS
+                    if (devIdx < MAX_SLOTS && payload.Length >= 10)
+                    {
+                        int numColors = BitConverter.ToUInt16(payload, 4);
+                        if (numColors > 0 && payload.Length >= 6 + numColors * 4)
+                            SetSlotColor((int)devIdx, payload[6], payload[7], payload[8]);
+                    }
+                    break;
+
+                case 1051: // UPDATEZONELEDS
+                    if (devIdx < MAX_SLOTS && payload.Length >= 14)
+                    {
+                        int numColors = BitConverter.ToUInt16(payload, 8);
+                        if (numColors > 0 && payload.Length >= 10 + numColors * 4)
+                            SetSlotColor((int)devIdx, payload[10], payload[11], payload[12]);
+                    }
+                    break;
+
+                case 1052: // UPDATESINGLELED
+                    if (devIdx < MAX_SLOTS && payload.Length >= 8)
+                        SetSlotColor((int)devIdx, payload[4], payload[5], payload[6]);
+                    break;
+
+                case 1100: // SETCUSTOMMODE
+                    break;
+            }
+        }
+
+        private void SetSlotColor(int slot, byte r, byte g, byte b)
+        {
+            lock (colorLock)
+            {
+                pendingColors[slot]   = new DS4Color(r, g, b);
+                hasPendingColor[slot] = true;
+            }
+        }
+
+        private static void SendPacket(NetworkStream stream, uint devIdx, uint pktId, byte[] data)
+        {
+            byte[] header = new byte[16];
+            header[0] = (byte)'O'; header[1] = (byte)'R'; header[2] = (byte)'G'; header[3] = (byte)'B';
+            BitConverter.GetBytes(devIdx).CopyTo(header, 4);
+            BitConverter.GetBytes(pktId).CopyTo(header, 8);
+            BitConverter.GetBytes((uint)(data?.Length ?? 0)).CopyTo(header, 12);
+            stream.Write(header, 0, 16);
+            if (data != null && data.Length > 0)
+                stream.Write(data, 0, data.Length);
+        }
+
+        private static byte[] ReadExact(NetworkStream stream, int count)
+        {
+            byte[] buf = new byte[count];
+            int read = 0;
+            while (read < count)
+            {
+                int n = stream.Read(buf, read, count - read);
+                if (n == 0) return null;
+                read += n;
+            }
+            return buf;
+        }
+
+        private static byte[] BuildDeviceData(int slot, DS4Color currentColor)
+        {
+            using MemoryStream ms = new MemoryStream();
+            using BinaryWriter w  = new BinaryWriter(ms, Encoding.UTF8, leaveOpen: true);
+
+            w.Write((uint)0);       // total data_size placeholder
+            w.Write((uint)14);      // device type: gamepad
+
+            WriteString(w, $"DS4 Slot {slot + 1}");
+            WriteString(w, "Sony");
+            WriteString(w, "DualShock 4 Lightbar");
+            WriteString(w, "1.0");
+            WriteString(w, "");
+            WriteString(w, "");
+
+            w.Write((int)0);        // active_mode index
+            w.Write((uint)1);       // num_modes
+            WriteMode(w);
+            w.Write((uint)1);       // num_zones
+            WriteZone(w);
+            w.Write((uint)1);       // num_leds
+            WriteLed(w);
+
+            w.Write((uint)1);       // num_colors
+            w.Write(currentColor.red);
+            w.Write(currentColor.green);
+            w.Write(currentColor.blue);
+            w.Write((byte)0);       // alpha
+
+            byte[] result = ms.ToArray();
+            BitConverter.GetBytes((uint)(result.Length - 4)).CopyTo(result, 0);
+            return result;
+        }
+
+        private static void WriteMode(BinaryWriter w)
+        {
+            WriteString(w, "Static");
+            w.Write((int)0);        // value
+            w.Write((uint)0x20);    // flags: MODE_FLAG_HAS_PER_LED_COLOR
+            w.Write((uint)0);       // speed_min
+            w.Write((uint)0);       // speed_max
+            w.Write((uint)0);       // brightness_min
+            w.Write((uint)0);       // brightness_max
+            w.Write((uint)0);       // colors_min
+            w.Write((uint)0);       // colors_max
+            w.Write((uint)0);       // speed
+            w.Write((uint)0);       // brightness
+            w.Write((uint)0);       // direction
+            w.Write((uint)1);       // color_mode: COLOR_MODE_PER_LED
+            w.Write((ushort)0);     // num embedded mode colors
+        }
+
+        private static void WriteZone(BinaryWriter w)
+        {
+            WriteString(w, "Lightbar");
+            w.Write((uint)0);       // type: ZONE_TYPE_SINGLE
+            w.Write((uint)1);       // leds_min
+            w.Write((uint)1);       // leds_max
+            w.Write((uint)1);       // num_leds
+            w.Write((ushort)0);     // matrix_len (no matrix)
+        }
+
+        private static void WriteLed(BinaryWriter w)
+        {
+            WriteString(w, "Lightbar");
+            w.Write((uint)0);       // value
+        }
+
+        private static void WriteString(BinaryWriter w, string s)
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                w.Write((ushort)0);
+                return;
+            }
+            byte[] bytes = Encoding.UTF8.GetBytes(s);
+            w.Write((ushort)(bytes.Length + 1));
+            w.Write(bytes);
+            w.Write((byte)0);
+        }
+
+        public void Dispose() => Stop();
+    }
+}
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index fdcc9a2..06a2aea 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -629,6 +629,10 @@ public static bool IsWin10OrGreater()
                 BLANK_VIGEMBUS_VERSION);
         public static Version minSupportedViGEmBusVersionInfo = new Version(MIN_SUPPORTED_VIGEMBUS_VERSION);
         public static bool hidHideInstalled = IsHidHideInstalled();
+
+        public static bool openRGBSyncEnabled = false;
+        public static int openRGBServerPort   = 6743;
+
         public static bool fakerInputInstalled = IsFakerInputInstalled();
         public const string BLANK_FAKERINPUT_VERSION = "0.0.0.0";
         public static string fakerInputVersion = FakerInputVersion();

From da65d1a9528df66c50b5918cff20b793cf67c586 Mon Sep 17 00:00:00 2001
From: Test <test@test.com>
Date: Wed, 10 Jun 2026 00:11:02 +0100
Subject: [PATCH 22/47] feat: use HidHide session blacklist for automatic
 device unhiding on exit

---
 DS4Windows/DS4Control/ControlService.cs   | 26 ++++++++++++++
 DS4Windows/DS4Control/HidHideAPIDevice.cs | 41 +++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 53da5b8..e275e06 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -942,9 +942,35 @@ private void ChangeExclusiveStatus(DS4Device dev)
             if (Global.hidHideInstalled)
             {
                 dev.CurrentExclusiveStatus = DS4Device.ExclusiveStatus.HidHideAffected;
+                TryAddDeviceToSessionBlacklist(dev);
             }
         }
 
+        /// <summary>
+        /// Adds the device to HidHide's process-lifetime (session) blacklist.
+        /// The entry is automatically removed by HidHide when DS4Windows exits --
+        /// cleanly or otherwise -- so other apps (Steam, OpenRGB) can reclaim the
+        /// device without requiring a reboot or manual HidHide configuration.
+        /// Falls back silently if the installed HidHide version predates session
+        /// blacklist support.
+        /// </summary>
+        private void TryAddDeviceToSessionBlacklist(DS4Device dev)
+        {
+            if (!Global.hidHideInstalled) return;
+            try
+            {
+                string instanceId = Global.GetInstanceIdFromDevicePath(dev.HidDevice.DevicePath);
+                if (string.IsNullOrEmpty(instanceId)) return;
+
+                using (HidHideAPIDevice hidHideDevice = new HidHideAPIDevice())
+                {
+                    if (!hidHideDevice.IsOpen()) return;
+                    hidHideDevice.AddSessionBlacklist(new System.Collections.Generic.List<string> { instanceId });
+                }
+            }
+            catch { /* HidHide version predates session blacklist -- ignore */ }
+        }
+
         private void TestQueueBus(Action temp)
         {
             eventDispatcher.BeginInvoke(() =>
diff --git a/DS4Windows/DS4Control/HidHideAPIDevice.cs b/DS4Windows/DS4Control/HidHideAPIDevice.cs
index 19bf67c..87d4ab3 100644
--- a/DS4Windows/DS4Control/HidHideAPIDevice.cs
+++ b/DS4Windows/DS4Control/HidHideAPIDevice.cs
@@ -35,6 +35,8 @@ class HidHideAPIDevice : IDisposable
         private const uint IOCTL_SET_ACTIVE = 0x80016014;
         private const uint IOCTL_GET_WL_INVERT = 0x80016018;
         private const uint IOCTL_SET_WL_INVERT = 0x8001601C;
+        private const uint IOCTL_ADD_SESSION_BLACKLIST = 0x80016020;
+        private const uint IOCTL_CLR_SESSION_BLACKLIST = 0x80016024;
 
         private const string CONTROL_DEVICE_FILENAME = "\\\\.\\HidHide";
 
@@ -159,6 +161,45 @@ public bool SetBlacklist(List<string> instances)
             return result;
         }
 
+        /// <summary>
+        /// Adds device instance paths to a process-lifetime blacklist.
+        /// Entries are automatically removed by HidHide when this process exits,
+        /// regardless of whether the exit is clean or due to a crash.
+        /// Requires HidHide with session blacklist support (v1.5+).
+        /// </summary>
+        public bool AddSessionBlacklist(List<string> instances)
+        {
+            if (instances == null || instances.Count == 0) return true;
+
+            int bytesReturned = 0;
+            IntPtr inBuffer = StringListToMultiSzPointer(instances, out int inBufferLength);
+
+            bool result = NativeMethods.DeviceIoControl(hidHideHandle.DangerousGetHandle(),
+                IOCTL_ADD_SESSION_BLACKLIST,
+                inBuffer,
+                inBufferLength,
+                IntPtr.Zero,
+                0,
+                ref bytesReturned,
+                IntPtr.Zero);
+
+            Marshal.FreeHGlobal(inBuffer);
+            return result;
+        }
+
+        /// <summary>
+        /// Removes all session blacklist entries registered by this process.
+        /// Called automatically by HidHide on process exit; only needed for explicit early release.
+        /// </summary>
+        public bool ClearSessionBlacklist()
+        {
+            int bytesReturned = 0;
+            return NativeMethods.DeviceIoControl(hidHideHandle.DangerousGetHandle(),
+                IOCTL_CLR_SESSION_BLACKLIST,
+                IntPtr.Zero, 0, IntPtr.Zero, 0,
+                ref bytesReturned, IntPtr.Zero);
+        }
+
         public List<string> GetWhitelist()
         {
             List<string> instances = new List<string>();

From 2a45afef9e9410a85c2650663003a81f2ab5e5f5 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 08:32:56 -0500
Subject: [PATCH 23/47] Reset touchpad movement state on profile load

---
 DS4Windows/DS4Control/ControlService.cs |  9 +++++++++
 DS4Windows/DS4Control/ScpUtil.cs        | 13 +++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 53da5b8..6dc8a7d 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -3616,6 +3616,15 @@ public void StartTPOff(int deviceID)
             }
         }
 
+        public void SetTouchpadMovementActive(int deviceID, bool active)
+        {
+            if (deviceID < CURRENT_DS4_CONTROLLER_LIMIT)
+            {
+                TouchActive[deviceID] = active;
+                touchreleased[deviceID] = true;
+            }
+        }
+
         public string TouchpadSlide(int ind)
         {
             DS4State cState = CurrentState[ind];
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index fdcc9a2..7db72c7 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -5531,8 +5531,8 @@ public bool LoadProfileNew(int device, bool launchprogram, ControlService contro
                     }
                 }
 
-                // Check if Touchpad should be switched off
-                if (startTouchpadOff[device] == true) control.StartTPOff(device);
+                // Reset the runtime touchpad movement toggle from the loaded profile.
+                control.SetTouchpadMovementActive(device, !startTouchpadOff[device]);
 
                 {
                     bool tempToggle = gyroControlsInf[device].triggerToggle;
@@ -6584,9 +6584,14 @@ public bool LoadProfile(int device, bool launchprogram, ControlService control,
                 {
                     Item = m_Xdoc.SelectSingleNode("/" + rootname + "/StartTouchpadOff");
                     bool.TryParse(Item.InnerText, out startTouchpadOff[device]);
-                    if (startTouchpadOff[device] == true) control.StartTPOff(device);
+                    control.SetTouchpadMovementActive(device, !startTouchpadOff[device]);
+                }
+                catch
+                {
+                    startTouchpadOff[device] = false;
+                    control.SetTouchpadMovementActive(device, true);
+                    missingSetting = true;
                 }
-                catch { startTouchpadOff[device] = false; missingSetting = true; }
 
                 // Fallback lookup if TouchpadOutMode is not set
                 bool tpForControlsPresent = false;

From a5fc70956a96ffca785a0315be4737e5fd7d11bc Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 10:08:31 -0500
Subject: [PATCH 24/47] Ignore stale virtual DS4 outputs on startup

---
 .../DS4Control/DTOXml/OutputSlotPersistDTO.cs | 37 +++++++++++++++++--
 DS4Windows/DS4Control/DTOXml/ProfileDTO.cs    |  9 ++++-
 DS4Windows/DS4Library/DS4Devices.cs           | 15 ++++++++
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/DS4Windows/DS4Control/DTOXml/OutputSlotPersistDTO.cs b/DS4Windows/DS4Control/DTOXml/OutputSlotPersistDTO.cs
index ca3d560..be13fba 100644
--- a/DS4Windows/DS4Control/DTOXml/OutputSlotPersistDTO.cs
+++ b/DS4Windows/DS4Control/DTOXml/OutputSlotPersistDTO.cs
@@ -18,8 +18,6 @@ You should have received a copy of the GNU General Public License
 
 using System;
 using System.Collections.Generic;
-using System.Windows.Documents;
-using System.Xml;
 using System.Xml.Serialization;
 using DS4Windows;
 
@@ -76,11 +74,37 @@ public void MapTo(OutputSlotManager destination)
 
                 if (tempDev != null)
                 {
+                    if (tempSlot.DeviceType == OutContType.None)
+                    {
+                        continue;
+                    }
+
                     tempDev.CurrentReserveStatus = OutSlotDevice.ReserveStatus.Permanent;
                     tempDev.PermanentType = tempSlot.DeviceType;
                 }
             }
         }
+
+        internal static OutContType ParseOutputDeviceType(string value, OutContType fallback)
+        {
+            if (Enum.TryParse(value, true, out OutContType parsed) &&
+                Enum.IsDefined(typeof(OutContType), parsed))
+            {
+                return parsed;
+            }
+
+            return fallback;
+        }
+
+        internal static string FormatOutputDeviceType(OutContType value)
+        {
+            return value switch
+            {
+                OutContType.DS4 => "DS4",
+                OutContType.None => "None",
+                _ => "X360",
+            };
+        }
     }
 
     public class OutputSlotSerializer
@@ -91,10 +115,17 @@ public int Index
             get; set;
         } = 0;
 
-        [XmlElement("DeviceType")]
+        [XmlIgnore]
         public OutContType DeviceType
         {
             get; set;
         }
+
+        [XmlElement("DeviceType")]
+        public string DeviceTypeString
+        {
+            get => OutputSlotPersistDTO.FormatOutputDeviceType(DeviceType);
+            set => DeviceType = OutputSlotPersistDTO.ParseOutputDeviceType(value, OutContType.None);
+        }
     }
 }
diff --git a/DS4Windows/DS4Control/DTOXml/ProfileDTO.cs b/DS4Windows/DS4Control/DTOXml/ProfileDTO.cs
index be803d0..89f2a62 100644
--- a/DS4Windows/DS4Control/DTOXml/ProfileDTO.cs
+++ b/DS4Windows/DS4Control/DTOXml/ProfileDTO.cs
@@ -1436,12 +1436,19 @@ public AbsMouseRegionSettingsSerializer AbsMouseRegionSettings
             get; set;
         }
 
-        [XmlElement("OutputContDevice")]
+        [XmlIgnore]
         public OutContType OutputContDevice
         {
             get; set;
         } = BackingStore.DEFAULT_OUT_CONT_TYPE;
 
+        [XmlElement("OutputContDevice")]
+        public string OutputContDeviceString
+        {
+            get => OutputSlotPersistDTO.FormatOutputDeviceType(OutputContDevice);
+            set => OutputContDevice = OutputSlotPersistDTO.ParseOutputDeviceType(value, BackingStore.DEFAULT_OUT_CONT_TYPE);
+        }
+
         [XmlElement("DS4OutputTriggerMode")]
         public DS4TriggerOutputMode OutputDS4TriggerMode
         {
diff --git a/DS4Windows/DS4Library/DS4Devices.cs b/DS4Windows/DS4Library/DS4Devices.cs
index 69fc0dc..ab0efaf 100644
--- a/DS4Windows/DS4Library/DS4Devices.cs
+++ b/DS4Windows/DS4Library/DS4Devices.cs
@@ -213,6 +213,7 @@ private static bool DetectNewControllers
         // ViGEm-created DS4 controllers report the Sony VID with one of these PIDs.
         private static readonly int[] VirtualDS4Pids = { 0x05C4, 0x09CC };
         private static readonly TimeSpan OwnVirtualDS4PendingTimeout = TimeSpan.FromSeconds(2);
+        private const string VigemVirtualDS4MacPrefix = "C0:13:37";
 
         private static HashSet<string> SnapshotVirtualDS4Paths()
         {
@@ -320,6 +321,14 @@ public static bool IsOwnVirtualDevice(string devicePath)
             }
         }
 
+        private static bool HasViGEmVirtualDS4Identity(HidDevice hDevice, string serial)
+        {
+            return hDevice.Attributes.VendorId == SONY_VID &&
+                VirtualDS4Pids.Contains(hDevice.Attributes.ProductId) &&
+                !string.IsNullOrEmpty(serial) &&
+                serial.StartsWith(VigemVirtualDS4MacPrefix, StringComparison.OrdinalIgnoreCase);
+        }
+
         private static bool IsRealDS4(HidDevice hDevice)
         {
             // Our own virtual output controllers are never valid input, regardless of
@@ -489,6 +498,12 @@ public static void findControllers()
                             serial = hDevice.ReadSerial(DS4Device.SERIAL_FEATURE_ID);
                         }
 
+                        if (HasViGEmVirtualDS4Identity(hDevice, serial))
+                        {
+                            hDevice.Dispose();
+                            continue;
+                        }
+
                         bool validSerial = !serial.Equals(DS4Device.BLANK_SERIAL);
                         bool newdev = true;
                         if (validSerial && deviceSerials.Contains(serial))

From a6bef7519f362d8e4e96481860f3fc76651f5f6e Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 10:15:03 -0500
Subject: [PATCH 25/47] Bump version to 4.0.2.1

---
 DS4Windows/DS4WinWPF.csproj | 8 ++++----
 DS4Windows/newest.txt       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DS4Windows/DS4WinWPF.csproj b/DS4Windows/DS4WinWPF.csproj
index 4bff668..1c1ac01 100644
--- a/DS4Windows/DS4WinWPF.csproj
+++ b/DS4Windows/DS4WinWPF.csproj
@@ -15,10 +15,10 @@
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
 		<EnableNETAnalyzers>false</EnableNETAnalyzers>
 		<ServerGarbageCollection>true</ServerGarbageCollection>
-		<AssemblyVersion>4.0.2</AssemblyVersion>
-		<FileVersion>4.0.2</FileVersion>
-		<Version>4.0.2</Version>
-		<InformationalVersion>4.0.2</InformationalVersion>
+		<AssemblyVersion>4.0.2.1</AssemblyVersion>
+		<FileVersion>4.0.2.1</FileVersion>
+		<Version>4.0.2.1</Version>
+		<InformationalVersion>4.0.2.1</InformationalVersion>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
diff --git a/DS4Windows/newest.txt b/DS4Windows/newest.txt
index 4d54dad..b7f887d 100644
--- a/DS4Windows/newest.txt
+++ b/DS4Windows/newest.txt
@@ -1 +1 @@
-4.0.2
+4.0.2.1

From c83c5160a8bbf142afabe2c09a52f270ca55193f Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 10:33:25 -0500
Subject: [PATCH 26/47] Harden DS4Windows shortcut relaunch guard

---
 DS4Windows/App.xaml.cs | 48 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/DS4Windows/App.xaml.cs b/DS4Windows/App.xaml.cs
index 0e13d69..9ccdb72 100644
--- a/DS4Windows/App.xaml.cs
+++ b/DS4Windows/App.xaml.cs
@@ -25,6 +25,8 @@ You should have received a copy of the GNU General Public License
 using System.IO.MemoryMappedFiles;
 using System.Net.Http;
 using System.Runtime.InteropServices;
+using System.Security.AccessControl;
+using System.Security.Principal;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -119,8 +121,8 @@ private void Application_Startup(object sender, StartupEventArgs e)
             try
             {
                 if (EventWaitHandleAcl.TryOpenExisting(SingleAppComEventName,
-                System.Security.AccessControl.EventWaitHandleRights.Synchronize |
-                System.Security.AccessControl.EventWaitHandleRights.Modify,
+                EventWaitHandleRights.Synchronize |
+                EventWaitHandleRights.Modify,
                 out EventWaitHandle tempComEvent))
                 {
                     tempComEvent.Set();  // signal the other instance.
@@ -133,7 +135,11 @@ private void Application_Startup(object sender, StartupEventArgs e)
             }
             catch (System.UnauthorizedAccessException)
             {
-                // Ignore exception
+                // An existing elevated instance can deny this process access if it was
+                // started by an older build. Do not continue into a second mapper.
+                runShutdown = false;
+                Current.Shutdown();
+                return;
             }
 
             // Allow sleep time durations less than 16 ms
@@ -143,7 +149,18 @@ private void Application_Startup(object sender, StartupEventArgs e)
             DS4Windows.Global.RefreshViGEmBusInfo();
 
             // Create the Event handle
-            threadComEvent = new EventWaitHandle(false, EventResetMode.ManualReset, SingleAppComEventName);
+            try
+            {
+                threadComEvent = CreateSingleAppComEvent();
+            }
+            catch (UnauthorizedAccessException)
+            {
+                // Another elevated instance can win the race with older event security.
+                runShutdown = false;
+                Current.Shutdown();
+                return;
+            }
+
             CreateTempWorkerThread();
 
             CreateControlService(parser);
@@ -293,6 +310,29 @@ private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionE
             }
         }
 
+        private static EventWaitHandle CreateSingleAppComEvent()
+        {
+            EventWaitHandleSecurity security = new EventWaitHandleSecurity();
+            EventWaitHandleRights appRights = EventWaitHandleRights.Synchronize |
+                EventWaitHandleRights.Modify |
+                EventWaitHandleRights.ReadPermissions;
+
+            SecurityIdentifier authenticatedUsersSid = new SecurityIdentifier(
+                WellKnownSidType.AuthenticatedUserSid, null);
+            security.AddAccessRule(new EventWaitHandleAccessRule(authenticatedUsersSid,
+                appRights, AccessControlType.Allow));
+
+            SecurityIdentifier currentUserSid = WindowsIdentity.GetCurrent().User;
+            if (currentUserSid != null)
+            {
+                security.AddAccessRule(new EventWaitHandleAccessRule(currentUserSid,
+                    EventWaitHandleRights.FullControl, AccessControlType.Allow));
+            }
+
+            return EventWaitHandleAcl.Create(false, EventResetMode.ManualReset,
+                SingleAppComEventName, out _, security);
+        }
+
         private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
             //Debug.WriteLine("App Crashed");

From 6afd8c85a35d034bb11f685f9fca87a2dfb612f9 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 10:45:42 -0500
Subject: [PATCH 27/47] Avoid ViGEm dispose crash during app exit

---
 DS4Windows/App.xaml.cs                  |  2 +-
 DS4Windows/DS4Control/ControlService.cs | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/DS4Windows/App.xaml.cs b/DS4Windows/App.xaml.cs
index 9ccdb72..827b53c 100644
--- a/DS4Windows/App.xaml.cs
+++ b/DS4Windows/App.xaml.cs
@@ -792,7 +792,7 @@ private void CleanShutdown()
                     {
                         if (rootHub.running)
                         {
-                            rootHub.Stop(immediateUnplug: true);
+                            rootHub.Stop(immediateUnplug: true, disposeViGEm: false);
                             rootHub.ShutDown();
                         }
                     }).Wait();
diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index e619097..42a4aea 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -1960,7 +1960,7 @@ public void PrepareAbort()
             }
         }
 
-        public bool Stop(bool showlog = true, bool immediateUnplug = false)
+        public bool Stop(bool showlog = true, bool immediateUnplug = false, bool disposeViGEm = true)
         {
             if (running)
             {
@@ -2070,7 +2070,14 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false)
                     Thread.Sleep(OutputSlotManager.DELAY_TIME);
                 }
 
-                StopViGEm();
+                if (disposeViGEm)
+                {
+                    StopViGEm();
+                }
+                else
+                {
+                    vigemTestClient = null;
+                }
 
                 // Disconnect from KBM system when stopping ControlService
                 LogDebug($"Closing connection to output handler {outputKBMHandler.GetDisplayName()}");

From 147c313bb480c8d2cd23deb8e723878683eab9ed Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 11:04:39 -0500
Subject: [PATCH 28/47] Add gated startup crash diagnostics

---
 DS4Windows/App.xaml.cs                        |  36 +++
 DS4Windows/DS4Control/ControlService.cs       | 205 +++++++++++++++++-
 .../DS4Control/DTOXml/AppSettingsDTO.cs       |   9 +
 DS4Windows/DS4Control/OutputSlotManager.cs    |  21 ++
 DS4Windows/DS4Control/ScpUtil.cs              |   7 +
 DS4Windows/DS4Control/Xbox360OutDevice.cs     |   9 +
 DS4Windows/DS4Forms/MainWindow.xaml           |   3 +
 DS4Windows/DS4Forms/MainWindow.xaml.cs        |   7 +
 .../DS4Forms/ViewModels/SettingsViewModel.cs  |  14 ++
 9 files changed, 309 insertions(+), 2 deletions(-)

diff --git a/DS4Windows/App.xaml.cs b/DS4Windows/App.xaml.cs
index 827b53c..1c6dd72 100644
--- a/DS4Windows/App.xaml.cs
+++ b/DS4Windows/App.xaml.cs
@@ -207,8 +207,12 @@ private void Application_Startup(object sender, StartupEventArgs e)
             logger.Info($"OS Release ID: {DS4Windows.Util.GetOSReleaseId()}");
             logger.Info($"System Architecture: {(Environment.Is64BitOperatingSystem ? "x64" : "x86")}");
             logger.Info("Logger created");
+            StartupDiag(logger, $"App bootstrap pid={Environment.ProcessId} admin={DS4Windows.Global.IsAdministrator()} cwd=\"{Environment.CurrentDirectory}\" cmd=\"{Environment.CommandLine}\"");
+            StartupDiag(logger, $"Exe location=\"{DS4Windows.Global.exelocation}\" configPath=\"{DS4Windows.Global.appdatapath}\" firstRun={firstRun}");
 
+            StartupDiag(logger, "Global.Load begin");
             bool readAppConfig = DS4Windows.Global.Load();
+            StartupDiag(logger, $"Global.Load end readAppConfig={readAppConfig}");
             if (!firstRun && !readAppConfig)
             {
                 logger.Info($@"Profiles.xml not read at location ${DS4Windows.Global.appdatapath}\Profiles.xml. Using default app settings");
@@ -241,9 +245,16 @@ private void Application_Startup(object sender, StartupEventArgs e)
 
             skipSave = false;
 
+            StartupDiag(logger, "Global.LoadActions begin");
             if (!DS4Windows.Global.LoadActions())
             {
+                StartupDiag(logger, "Global.LoadActions failed; CreateStdActions begin");
                 DS4Windows.Global.CreateStdActions();
+                StartupDiag(logger, "CreateStdActions end");
+            }
+            else
+            {
+                StartupDiag(logger, "Global.LoadActions end success");
             }
 
             // Have app use selected culture
@@ -251,16 +262,24 @@ private void Application_Startup(object sender, StartupEventArgs e)
             DS4Windows.AppThemeChoice themeChoice = DS4Windows.Global.UseCurrentTheme;
             ChangeTheme(DS4Windows.Global.UseCurrentTheme, false);
 
+            StartupDiag(logger, "LoadLinkedProfiles begin");
             DS4Windows.Global.LoadLinkedProfiles();
+            StartupDiag(logger, "LoadLinkedProfiles end");
+            StartupDiag(logger, "MainWindow ctor begin");
             DS4Forms.MainWindow window = new DS4Forms.MainWindow(parser);
+            StartupDiag(logger, "MainWindow ctor end");
             MainWindow = window;
             window.IsInitialShow = true;
+            StartupDiag(logger, "MainWindow.Show begin");
             window.Show();
+            StartupDiag(logger, "MainWindow.Show end");
             window.IsInitialShow = false;
 
             // Set up hooks for IPC command calls
             HwndSource source = PresentationSource.FromVisual(window) as HwndSource;
+            StartupDiag(logger, "CreateIPCClassNameMMF begin");
             CreateIPCClassNameMMF(source.Handle);
+            StartupDiag(logger, "CreateIPCClassNameMMF end");
 
             window.CheckMinStatus();
 
@@ -269,11 +288,28 @@ private void Application_Startup(object sender, StartupEventArgs e)
 
             if (DS4Windows.Global.hidHideInstalled)
             {
+                StartupDiag(logger, "CheckHidHidePresence begin");
                 rootHub.CheckHidHidePresence();
+                StartupDiag(logger, "CheckHidHidePresence end");
             }
 
+            StartupDiag(logger, "LoadPermanentSlotsConfig begin");
             rootHub.LoadPermanentSlotsConfig();
+            StartupDiag(logger, "LoadPermanentSlotsConfig end");
+            StartupDiag(logger, "MainWindow.LateChecks begin");
             window.LateChecks(parser);
+            StartupDiag(logger, "MainWindow.LateChecks returned");
+        }
+
+        private static void StartupDiag(Logger logger, string message)
+        {
+            if (!DS4Windows.Global.VerboseStartupLogging)
+            {
+                return;
+            }
+
+            logger.Info($"[StartupDiag][T{Thread.CurrentThread.ManagedThreadId}] {message}");
+            LogManager.Flush(TimeSpan.FromSeconds(1));
         }
 
         private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 42a4aea..0c6533b 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License
 using DS4WinWPF.DS4Control;
 using Microsoft.Win32;
 using Nefarius.ViGEm.Client;
+using NLog;
 using Sensorit.Base;
 using SharpOSC;
 using System;
@@ -68,6 +69,7 @@ public class ControlService
         bool[] buttonsdown = new bool[MAX_DS4_CONTROLLER_COUNT] { false, false, false, false, false, false, false, false };
         bool[] held = new bool[MAX_DS4_CONTROLLER_COUNT];
         int[] oldmouse = new int[MAX_DS4_CONTROLLER_COUNT] { -1, -1, -1, -1, -1, -1, -1, -1 };
+        private int[] startupReportDiagCounts = new int[MAX_DS4_CONTROLLER_COUNT];
         public OutputDevice[] outputDevices = new OutputDevice[MAX_DS4_CONTROLLER_COUNT] { null, null, null, null, null, null, null, null };
         private OneEuroFilter3D[] udpEuroPairAccel = new OneEuroFilter3D[UdpServer.NUMBER_SLOTS]
         {
@@ -100,6 +102,7 @@ public class ControlService
         public ControlServiceDeviceOptions DeviceOptions { get => deviceOptions; }
 
         private DS4WinWPF.ArgumentParser cmdParser;
+        private static readonly Logger startupDiagLogger = LogManager.GetCurrentClassLogger();
 
         public event EventHandler ServiceStarted;
         public event EventHandler PreServiceStop;
@@ -489,18 +492,26 @@ private void InitOutputKBMHandler()
 
         private void InitOutputKBMHandler(string attemptVirtualkbmHandler)
         {
+            StartupDiag($"InitOutputKBMHandler begin requested={attemptVirtualkbmHandler}");
             Global.InitOutputKBMHandler(attemptVirtualkbmHandler);
+            StartupDiag($"InitOutputKBMHandler created handler={Global.outputKBMHandler?.GetIdentifier()}");
 
             bool handlerConnected = false;
             try
             {
+                StartupDiag($"OutputKBM.Connect begin handler={Global.outputKBMHandler?.GetIdentifier()}");
                 handlerConnected = Global.outputKBMHandler.Connect();
+                StartupDiag($"OutputKBM.Connect end handler={Global.outputKBMHandler?.GetIdentifier()} connected={handlerConnected}");
+            }
+            catch (Exception ex)
+            {
+                StartupDiag($"OutputKBM.Connect exception handler={Global.outputKBMHandler?.GetIdentifier()} {ex.GetType().Name}: {ex.Message}");
             }
-            catch { }
 
             if (!handlerConnected &&
                 attemptVirtualkbmHandler != VirtualKBMFactory.GetFallbackHandlerIdentifier())
             {
+                StartupDiag($"OutputKBM falling back to {VirtualKBMFactory.GetFallbackHandlerIdentifier()}");
                 Global.outputKBMHandler = VirtualKBMFactory.GetFallbackHandler();
             }
             else
@@ -515,6 +526,7 @@ private void InitOutputKBMHandler(string attemptVirtualkbmHandler)
             Global.InitOutputKBMMapping(Global.outputKBMHandler.GetIdentifier());
             Global.outputKBMMapping.PopulateConstants();
             Global.outputKBMMapping.PopulateMappings();
+            StartupDiag($"InitOutputKBMHandler end active={Global.outputKBMHandler?.GetFullDisplayName()} mapping={Global.outputKBMMapping?.GetType().Name}");
         }
 
         private bool SwitchOutputKBMHandler(string identifier)
@@ -1161,17 +1173,24 @@ private void WarnExclusiveModeFailure(DS4Device device)
 
         private void StartViGEm()
         {
+            StartupDiag("StartViGEm begin");
             // Refresh internal ViGEmBus info
             Global.RefreshViGEmBusInfo();
+            StartupDiag($"StartViGEm info installed={Global.vigemInstalled} version={Global.vigembusVersion} supported={Global.IsRunningSupportedViGEmBus()}");
             if (Global.IsRunningSupportedViGEmBus())
             {
                 tempThread = new Thread(() =>
                 {
                     try
                     {
+                        StartupDiag("ViGEmClient ctor begin");
                         vigemTestClient = new ViGEmClient();
+                        StartupDiag("ViGEmClient ctor end success");
+                    }
+                    catch (Exception ex)
+                    {
+                        StartupDiag($"ViGEmClient ctor exception {ex.GetType().Name}: {ex.Message}");
                     }
-                    catch { }
                 });
                 tempThread.Priority = ThreadPriority.AboveNormal;
                 tempThread.IsBackground = true;
@@ -1183,13 +1202,16 @@ private void StartViGEm()
             }
 
             tempThread = null;
+            StartupDiag($"StartViGEm end clientCreated={vigemTestClient != null}");
         }
 
         private void StopViGEm()
         {
             if (vigemTestClient != null)
             {
+                StartupDiag("StopViGEm Dispose begin");
                 vigemTestClient.Dispose();
+                StartupDiag("StopViGEm Dispose end");
                 vigemTestClient = null;
             }
         }
@@ -1233,8 +1255,10 @@ public void AssignInitialDevices()
 
         private OutputDevice EstablishOutDevice(int index, OutContType contType)
         {
+            StartupDiag($"EstablishOutDevice begin index={index} contType={contType} client={vigemTestClient != null}");
             OutputDevice temp = null;
             temp = outputslotMan.AllocateController(contType, vigemTestClient);
+            StartupDiag($"EstablishOutDevice end index={index} contType={contType} result={temp?.GetType().Name ?? "null"}");
             return temp;
         }
 
@@ -1521,11 +1545,13 @@ public void DetachUnboundOutDev(OutSlotDevice slotDevice)
         public void PluginOutDev(int index, DS4Device device)
         {
             OutContType contType = Global.OutContType[index];
+            StartupDiag($"PluginOutDev enter index={index} contType={contType} useDInputOnly={useDInputOnly[index]} profileDInputOnly={getDInputOnly(index)}");
 
             OutSlotDevice slotDevice = null;
             if (!getDInputOnly(index))
             {
                 slotDevice = outputslotMan.FindExistUnboundSlotType(contType);
+                StartupDiag($"PluginOutDev existingSlot index={index} found={slotDevice != null} slot={(slotDevice != null ? slotDevice.Index + 1 : 0)}");
             }
 
             if (useDInputOnly[index])
@@ -1538,10 +1564,12 @@ public void PluginOutDev(int index, DS4Device device)
                     if (slotDevice == null)
                     {
                         slotDevice = outputslotMan.FindOpenSlot();
+                        StartupDiag($"PluginOutDev X360 openSlot index={index} found={slotDevice != null} slot={(slotDevice != null ? slotDevice.Index + 1 : 0)}");
                         if (slotDevice != null)
                         {
                             Xbox360OutDevice tempXbox = EstablishOutDevice(index, OutContType.X360)
                             as Xbox360OutDevice;
+                            StartupDiag($"PluginOutDev X360 established index={index} null={tempXbox == null}");
                             //outputDevices[index] = tempXbox;
 
                             // Enable ViGem feedback callback handler only if lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
@@ -1559,7 +1587,9 @@ public void PluginOutDev(int index, DS4Device device)
                                 }
                             }
 
+                            StartupDiag($"PluginOutDev X360 DeferredPlugin begin index={index}");
                             outputslotMan.DeferredPlugin(tempXbox, index, $"{device.DisplayName} [{device.MacAddress}]", outputDevices, contType);
+                            StartupDiag($"PluginOutDev X360 DeferredPlugin end index={index}");
                             //slotDevice.CurrentInputBound = OutSlotDevice.InputBound.Bound;
 
                             success = true;
@@ -1571,6 +1601,7 @@ public void PluginOutDev(int index, DS4Device device)
                     }
                     else
                     {
+                        StartupDiag($"PluginOutDev X360 reusing slot index={index} slot={slotDevice.Index + 1}");
                         slotDevice.CurrentInputBound = OutSlotDevice.InputBound.Bound;
                         Xbox360OutDevice tempXbox = slotDevice.OutputDevice as Xbox360OutDevice;
 
@@ -1603,10 +1634,12 @@ public void PluginOutDev(int index, DS4Device device)
                     if (slotDevice == null)
                     {
                         slotDevice = outputslotMan.FindOpenSlot();
+                        StartupDiag($"PluginOutDev DS4 openSlot index={index} found={slotDevice != null} slot={(slotDevice != null ? slotDevice.Index + 1 : 0)}");
                         if (slotDevice != null)
                         {
                             DS4OutDevice tempDS4 = EstablishOutDevice(index, OutContType.DS4)
                             as DS4OutDevice;
+                            StartupDiag($"PluginOutDev DS4 established index={index} null={tempDS4 == null}");
 
                             // Enable ViGem feedback callback handler only if DS4 lightbar/rumble data output is enabled (if those are disabled then no point enabling ViGem callback handler call)
                             if (Global.EnableOutputDataToDS4[index])
@@ -1623,7 +1656,9 @@ public void PluginOutDev(int index, DS4Device device)
                                 }
                             }
 
+                            StartupDiag($"PluginOutDev DS4 DeferredPlugin begin index={index}");
                             outputslotMan.DeferredPlugin(tempDS4, index, $"{device.DisplayName} [{device.MacAddress}]", outputDevices, contType);
+                            StartupDiag($"PluginOutDev DS4 DeferredPlugin end index={index}");
                             //slotDevice.CurrentInputBound = OutSlotDevice.InputBound.Bound;
 
                             success = true;
@@ -1635,6 +1670,7 @@ public void PluginOutDev(int index, DS4Device device)
                     }
                     else
                     {
+                        StartupDiag($"PluginOutDev DS4 reusing slot index={index} slot={slotDevice.Index + 1}");
                         slotDevice.CurrentInputBound = OutSlotDevice.InputBound.Bound;
                         DS4OutDevice tempDS4 = slotDevice.OutputDevice as DS4OutDevice;
 
@@ -1672,12 +1708,18 @@ public void PluginOutDev(int index, DS4Device device)
                 {
                     LogDebug($"Associated input controller #{index + 1} ({device.DisplayName}) to virtual {slotDevice.OutputDevice.GetDeviceType()} Controller in{(slotDevice.PermanentType != OutContType.None ? " permanent" : "")} output slot #{slotDevice.Index + 1}");
                     useDInputOnly[index] = false;
+                    StartupDiag($"PluginOutDev success index={index} slot={slotDevice.Index + 1} output={slotDevice.OutputDevice.GetDeviceType()}");
                 }
                 else
                 {
                     LogDebug("Failed. No output device was associated");
+                    StartupDiag($"PluginOutDev failed index={index} success={success} slotNull={slotDevice == null} slotOutputNull={slotDevice?.OutputDevice == null}");
                 }
             }
+            else
+            {
+                StartupDiag($"PluginOutDev skipped index={index} useDInputOnly=false");
+            }
         }
 
         public void UnplugOutDev(int index, DS4Device device, bool immediate = false, bool force = false)
@@ -1718,13 +1760,18 @@ public void UnplugOutDev(int index, DS4Device device, bool immediate = false, bo
 
         public bool Start(bool showlog = true)
         {
+            StartupDiag($"ControlService.Start enter showlog={showlog} running={running} inServiceTask={inServiceTask} admin={Global.IsAdministrator()}");
             inServiceTask = true;
+            StartupDiag("ControlService.Start before StartViGEm");
             StartViGEm();
+            StartupDiag($"ControlService.Start after StartViGEm client={vigemTestClient != null}");
             if (vigemTestClient != null)
             //if (x360Bus.Open() && x360Bus.Start())
             {
                 // Initialize output KBM handler at start of ControlService
+                StartupDiag("ControlService.Start before InitOutputKBMHandler");
                 InitOutputKBMHandler();
+                StartupDiag($"ControlService.Start after InitOutputKBMHandler handler={Global.outputKBMHandler?.GetFullDisplayName()}");
 
                 if (showlog)
                     LogDebug(DS4WinWPF.Properties.Resources.Starting);
@@ -1743,11 +1790,15 @@ public bool Start(bool showlog = true)
 
                 DS4Devices.isExclusiveMode = getUseExclusiveMode(); //Re-enable Exclusive Mode
 
+                StartupDiag($"UpdateHidHiddenAttributes begin exclusive={DS4Devices.isExclusiveMode}");
                 UpdateHidHiddenAttributes();
+                StartupDiag("UpdateHidHiddenAttributes end");
 
                 if (Global.openRGBSyncEnabled)
                 {
+                    StartupDiag($"OpenRGB start begin port={Global.openRGBServerPort}");
                     bool openRGBStarted = OpenRGBServer.Instance.Start(Global.openRGBServerPort);
+                    StartupDiag($"OpenRGB start end started={openRGBStarted}");
                     if (showlog)
                         LogDebug(openRGBStarted
                             ? $"OpenRGB server listening on port {Global.openRGBServerPort}"
@@ -1762,35 +1813,46 @@ public bool Start(bool showlog = true)
 
                 if (isUsingOSCServer() && oscListener == null)
                 {
+                    StartupDiag("OSC listener start begin");
                     ChangeOSCListenerStatus(true);
+                    StartupDiag("OSC listener start requested");
                 }
 
                 if (isUsingOSCSender() && oscSender == null)
                 {
+                    StartupDiag("OSC sender start begin");
                     ChangeOSCSenderStatus(true);
+                    StartupDiag("OSC sender start requested");
                 }
 
                 if (isUsingUDPServer() && _udpServer == null)
                 {
+                    StartupDiag("UDP change-status start begin");
                     ChangeUDPStatus(true, false);
                     while (udpChangeStatus == true)
                     {
                         Thread.SpinWait(500);
                     }
+                    StartupDiag("UDP change-status start end");
                 }
 
                 try
                 {
                     loopControllers = true;
+                    StartupDiag("AssignInitialDevices begin");
                     AssignInitialDevices();
+                    StartupDiag("AssignInitialDevices end");
 
+                    StartupDiag("DS4Devices.findControllers dispatch begin");
                     eventDispatcher.Invoke(() =>
                     {
                         DS4Devices.findControllers();
                     });
+                    StartupDiag("DS4Devices.findControllers dispatch end");
 
                     IEnumerable<DS4Device> devices = DS4Devices.getDS4Controllers();
                     int numControllers = devices.Count();
+                    StartupDiag($"DS4Devices.getDS4Controllers count={numControllers}");
                     activeControllers = numControllers;
                     DS4LightBar.defaultLight = false;
                     int i = 0;
@@ -1799,8 +1861,11 @@ public bool Start(bool showlog = true)
                         devEnum.MoveNext() && loopControllers; i++)
                     {
                         DS4Device device = devEnum.Current;
+                        StartupDiag($"Prepare controller loop index={i} type={device.DeviceType} display={device.DisplayName} mac={device.MacAddress} conn={device.ConnectionType} synced={device.isSynced()} primary={device.PrimaryDevice}");
 
+                        StartupDiag($"BeginPrepareConnectedInputController begin index={i}");
                         BeginPrepareConnectedInputController(device, showlog: true);
+                        StartupDiag($"BeginPrepareConnectedInputController end index={i}");
 
                         if (deviceOptions.JoyConDeviceOpts.LinkedMode == JoyConDeviceOptions.LinkMode.Joined)
                         {
@@ -1836,7 +1901,9 @@ public bool Start(bool showlog = true)
 
                         DS4Controllers[i] = device;
                         device.DeviceSlotNumber = i;
+                        StartupDiag($"PrepareConnectedInputControllerSettingEvents begin index={i}");
                         PrepareConnectedInputControllerSettingEvents(numControllers, device, index: i);
+                        StartupDiag($"PrepareConnectedInputControllerSettingEvents end index={i}");
 
                         if (i >= CURRENT_DS4_CONTROLLER_LIMIT) // out of Xinput devices!
                             break;
@@ -1844,10 +1911,12 @@ public bool Start(bool showlog = true)
                 }
                 catch (Exception e)
                 {
+                    StartupDiag($"ControlService.Start managed exception {e.GetType().Name}: {e.Message}");
                     LogDebug(e.Message, true);
                     AppLogger.LogToTray(e.Message, true);
                 }
 
+                StartupDiag("ControlService.Start setting running=true");
                 running = true;
 
                 if (_udpServer != null)
@@ -1858,11 +1927,14 @@ public bool Start(bool showlog = true)
 
                     try
                     {
+                        StartupDiag($"UDP server Start begin address={UDP_SERVER_LISTEN_ADDRESS} port={UDP_SERVER_PORT}");
                         _udpServer.Start(UDP_SERVER_PORT, UDP_SERVER_LISTEN_ADDRESS);
                         LogDebug($"UDP server listening on address {UDP_SERVER_LISTEN_ADDRESS} port {UDP_SERVER_PORT}");
+                        StartupDiag("UDP server Start end");
                     }
                     catch (System.Net.Sockets.SocketException ex)
                     {
+                        StartupDiag($"UDP server Start exception {ex.SocketErrorCode}: {ex.Message}");
                         var errMsg = string.Format("Couldn't start UDP server on address {0}:{1}, outside applications won't be able to access pad data ({2})", UDP_SERVER_LISTEN_ADDRESS, UDP_SERVER_PORT, ex.SocketErrorCode);
 
                         LogDebug(errMsg, true);
@@ -1872,6 +1944,7 @@ public bool Start(bool showlog = true)
             }
             else
             {
+                StartupDiag("ControlService.Start no ViGEm client");
                 string logMessage = string.Empty;
                 if (!vigemInstalled)
                 {
@@ -1892,10 +1965,13 @@ public bool Start(bool showlog = true)
 
             inServiceTask = false;
             runHotPlug = true;
+            StartupDiag("ControlService.Start before ServiceStarted events");
             ServiceStarted?.Invoke(this, EventArgs.Empty);
             RunningChanged?.Invoke(this, EventArgs.Empty);
+            StartupDiag("ControlService.Start after RunningChanged");
             using var process = Process.GetCurrentProcess();
             process.PriorityClass = MainWindow.ProcessPriorityClasses[Global.ProcessPriority];
+            StartupDiag($"ControlService.Start exit priority={process.PriorityClass}");
             return true;
         }
 
@@ -1962,15 +2038,22 @@ public void PrepareAbort()
 
         public bool Stop(bool showlog = true, bool immediateUnplug = false, bool disposeViGEm = true)
         {
+            StartupDiag($"ControlService.Stop enter showlog={showlog} immediate={immediateUnplug} disposeViGEm={disposeViGEm} running={running}");
             if (running)
             {
                 if (OpenRGBServer.Instance.IsRunning)
+                {
+                    StartupDiag("ControlService.Stop OpenRGB stop begin");
                     OpenRGBServer.Instance.Stop();
+                    StartupDiag("ControlService.Stop OpenRGB stop end");
+                }
 
                 running = false;
                 runHotPlug = false;
                 inServiceTask = true;
+                StartupDiag("ControlService.Stop PreServiceStop begin");
                 PreServiceStop?.Invoke(this, EventArgs.Empty);
+                StartupDiag("ControlService.Stop PreServiceStop end");
 
                 if (showlog)
                     LogDebug(DS4WinWPF.Properties.Resources.StoppingX360);
@@ -1983,6 +2066,7 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
                     DS4Device tempDevice = DS4Controllers[i];
                     if (tempDevice != null)
                     {
+                        StartupDiag($"ControlService.Stop controller loop index={i} display={tempDevice.DisplayName} mac={tempDevice.MacAddress} conn={tempDevice.ConnectionType} charging={tempDevice.isCharging()}");
                         if ((DCBTatStop && !tempDevice.isCharging()) || suspending)
                         {
                             if (tempDevice.getConnectionType() == ConnectionType.BT)
@@ -2017,7 +2101,9 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
                         OutputDevice tempout = outputDevices[i];
                         if (tempout != null)
                         {
+                            StartupDiag($"ControlService.Stop UnplugOutDev begin index={i} type={tempout.GetDeviceType()}");
                             UnplugOutDev(i, tempDevice, immediate: immediateUnplug, force: true);
+                            StartupDiag($"ControlService.Stop UnplugOutDev end index={i}");
                             anyUnplugged = true;
                         }
 
@@ -2036,9 +2122,15 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
                 if (showlog)
                     LogDebug(DS4WinWPF.Properties.Resources.StoppingDS4);
 
+                StartupDiag("ControlService.Stop DualSenseAudio dispose begin");
                 dualSenseAudioPassthrough.Dispose();
+                StartupDiag("ControlService.Stop DualSenseAudio dispose end");
+                StartupDiag("ControlService.Stop DualSenseMicrophone dispose begin");
                 dualSenseMicrophonePassthrough.Dispose();
+                StartupDiag("ControlService.Stop DualSenseMicrophone dispose end");
+                StartupDiag("ControlService.Stop DS4Devices.stopControllers begin");
                 DS4Devices.stopControllers();
+                StartupDiag("ControlService.Stop DS4Devices.stopControllers end");
                 slotManager.ClearControllerList();
 
                 if (oscListener != null)
@@ -2053,7 +2145,9 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
 
                 if (_udpServer != null)
                 {
+                    StartupDiag("ControlService.Stop UDP stop begin");
                     ChangeUDPStatus(false);
+                    StartupDiag("ControlService.Stop UDP stop requested");
                 }
 
                 if (showlog)
@@ -2063,7 +2157,9 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
                 {
                     Thread.SpinWait(500);
                 }
+                StartupDiag("ControlService.Stop outputslotMan.Stop begin");
                 outputslotMan.Stop(true);
+                StartupDiag("ControlService.Stop outputslotMan.Stop end");
 
                 if (anyUnplugged)
                 {
@@ -2076,19 +2172,24 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
                 }
                 else
                 {
+                    StartupDiag("ControlService.Stop skipping ViGEm Dispose during app exit");
                     vigemTestClient = null;
                 }
 
                 // Disconnect from KBM system when stopping ControlService
+                StartupDiag($"ControlService.Stop outputKBM Disconnect begin handler={outputKBMHandler?.GetFullDisplayName()}");
                 LogDebug($"Closing connection to output handler {outputKBMHandler.GetDisplayName()}");
                 outputKBMHandler.Disconnect();
+                StartupDiag("ControlService.Stop outputKBM Disconnect end");
                 inServiceTask = false;
                 activeControllers = 0;
             }
 
             runHotPlug = false;
+            StartupDiag("ControlService.Stop before stopped events");
             ServiceStopped?.Invoke(this, EventArgs.Empty);
             RunningChanged?.Invoke(this, EventArgs.Empty);
+            StartupDiag("ControlService.Stop exit");
             return true;
         }
 
@@ -2224,10 +2325,19 @@ bool checkAlreadyExists()
 
         private void PrepareConnectedInputControllerSettingEvents(int numControllers, DS4Device device, int index)
         {
+            StartupDiag($"Controller prep begin index={index} numControllers={numControllers} display={device.DisplayName} mac={device.MacAddress} type={device.DeviceType}");
+            StartupDiag($"RefreshExtrasButtons begin index={index}");
             Global.RefreshExtrasButtons(index, GetKnownExtraButtons(device));
+            StartupDiag($"RefreshExtrasButtons end index={index}");
+            StartupDiag($"LoadControllerConfigs begin index={index}");
             Global.LoadControllerConfigs(device);
+            StartupDiag($"LoadControllerConfigs end index={index}");
+            StartupDiag($"device.LoadStoreSettings begin index={index}");
             device.LoadStoreSettings();
+            StartupDiag($"device.LoadStoreSettings end index={index}");
+            StartupDiag($"CheckControllerNumDeviceSettings begin index={index}");
             device.CheckControllerNumDeviceSettings(numControllers);
+            StartupDiag($"CheckControllerNumDeviceSettings end index={index}");
 
             slotManager.AddController(device, index);
             if (isUsingOSCSender())
@@ -2241,7 +2351,9 @@ private void PrepareConnectedInputControllerSettingEvents(int numControllers, DS
             device.SerialChange += this.On_SerialChange;
             device.ChargingChanged += CheckQuickCharge;
 
+            StartupDiag($"TouchPad create begin index={index}");
             touchPad[index] = new Mouse(index, device);
+            StartupDiag($"TouchPad create end index={index}");
             bool profileLoaded = false;
             bool useAutoProfile = useTempProfile[index];
             if (!useAutoProfile)
@@ -2258,7 +2370,13 @@ private void PrepareConnectedInputControllerSettingEvents(int numControllers, DS
                 }
 
                 // Now attempt to load requested profile and settings
+                StartupDiag($"LoadProfile begin index={index} profile=\"{ProfilePath[index]}\" linked={Global.linkedProfileCheck[index]}");
                 profileLoaded = LoadProfile(index, false, this, false, false);
+                StartupDiag($"LoadProfile end index={index} loaded={profileLoaded} profile=\"{ProfilePath[index]}\" dinputOnly={getDInputOnly(index)} outType={Global.OutContType[index]}");
+            }
+            else
+            {
+                StartupDiag($"LoadProfile skipped for auto/temp profile index={index} tempProfile=\"{tempprofilename[index]}\"");
             }
 
             if (profileLoaded || useAutoProfile)
@@ -2269,7 +2387,9 @@ private void PrepareConnectedInputControllerSettingEvents(int numControllers, DS
                 {
                     if (device.PrimaryDevice)
                     {
+                        StartupDiag($"PluginOutDev begin index={index} outType={Global.OutContType[index]}");
                         PluginOutDev(index, device);
+                        StartupDiag($"PluginOutDev end index={index} useDInputOnly={useDInputOnly[index]} activeOut={activeOutDevType[index]} outDev={outputDevices[index]?.GetDeviceType() ?? "null"}");
                     }
                     else if (device.JointDeviceSlotNumber != DS4Device.DEFAULT_JOINT_SLOT_NUMBER)
                     {
@@ -2292,7 +2412,9 @@ private void PrepareConnectedInputControllerSettingEvents(int numControllers, DS
 
                 if (device.PrimaryDevice && device.OutputMapGyro)
                 {
+                    StartupDiag($"TouchPadOn begin index={index}");
                     TouchPadOn(index, device);
+                    StartupDiag($"TouchPadOn end index={index}");
                 }
                 else if (device.JointDeviceSlotNumber != DS4Device.DEFAULT_JOINT_SLOT_NUMBER)
                 {
@@ -2309,8 +2431,16 @@ private void PrepareConnectedInputControllerSettingEvents(int numControllers, DS
                     }
                 }
 
+                StartupDiag($"CheckProfileOptions begin index={index}");
                 CheckProfileOptions(index, device);
+                StartupDiag($"CheckProfileOptions end index={index}");
+                StartupDiag($"SetupInitialHookEvents begin index={index}");
                 SetupInitialHookEvents(index, device);
+                StartupDiag($"SetupInitialHookEvents end index={index}");
+            }
+            else
+            {
+                StartupDiag($"Controller prep profile not loaded index={index} profile=\"{ProfilePath[index]}\"");
             }
 
             int tempIdx = index;
@@ -2318,13 +2448,19 @@ private void PrepareConnectedInputControllerSettingEvents(int numControllers, DS
             {
                 this.On_Report(sender, e, tempIdx);
             };
+            StartupDiag($"Report hook added index={index}");
 
             if (_udpServer != null && index < UdpServer.NUMBER_SLOTS)
             {
+                StartupDiag($"PrepareDevUDPMotion begin index={index}");
                 PrepareDevUDPMotion(device, tempIdx);
+                StartupDiag($"PrepareDevUDPMotion end index={index}");
             }
 
+            StartupDiag($"device.StartUpdate begin index={index}");
             device.StartUpdate();
+            StartupDiag($"device.StartUpdate end index={index}");
+            StartupDiag($"Controller prep end index={index}");
         }
 
         private void BeginPrepareConnectedInputController(DS4Device device, bool showlog = false)
@@ -3108,6 +3244,18 @@ protected void On_Report(DS4Device device, EventArgs e, int ind)
         {
             if (ind != -1)
             {
+                int startupReportCount = 0;
+                bool startupReportDiag = false;
+                if (Global.VerboseStartupLogging)
+                {
+                    startupReportCount = ++startupReportDiagCounts[ind];
+                    startupReportDiag = startupReportCount <= 5 || startupReportCount == 50;
+                    if (startupReportDiag)
+                    {
+                        StartupDiag($"On_Report enter index={ind} count={startupReportCount} synced={device.isSynced()} latency={device.Latency} useDInputOnly={useDInputOnly[ind]} activeOut={activeOutDevType[ind]} outDev={outputDevices[ind]?.GetDeviceType() ?? "null"}");
+                    }
+                }
+
                 string devError = tempStrings[ind] = device.error;
                 if (!string.IsNullOrEmpty(devError))
                 {
@@ -3232,6 +3380,11 @@ protected void On_Report(DS4Device device, EventArgs e, int ind)
 
                 cState = device.Debouncer.ProcessInput(cState);
 
+                if (startupReportDiag)
+                {
+                    StartupDiag($"On_Report pre-map index={ind} count={startupReportCount} buttons Cross={cState.Cross} Circle={cState.Circle} PS={cState.PS} LX={cState.LX} LY={cState.LY} RX={cState.RX} RY={cState.RY} L2={cState.L2} R2={cState.R2}");
+                }
+
                 cState = Mapping.SetCurveAndDeadzone(ind, cState, TempState[ind]);
 
                 if (!recordingMacro && (useTempProfile[ind] ||
@@ -3246,7 +3399,15 @@ protected void On_Report(DS4Device device, EventArgs e, int ind)
                         OSCPreMappingStep(ind, cState, tempMapState, oscMapState);
                     }
 
+                    if (startupReportDiag)
+                    {
+                        StartupDiag($"On_Report MapCustom begin index={ind} count={startupReportCount}");
+                    }
                     Mapping.MapCustom(ind, cState, tempMapState, ExposedState[ind], touchPad[ind], this);
+                    if (startupReportDiag)
+                    {
+                        StartupDiag($"On_Report MapCustom end index={ind} count={startupReportCount}");
+                    }
 
                     // Copy current Touchpad and Gyro data
                     // Might change to use new DS4State.CopyExtrasTo method
@@ -3287,7 +3448,15 @@ protected void On_Report(DS4Device device, EventArgs e, int ind)
                         }
                     }
 
+                    if (startupReportDiag)
+                    {
+                        StartupDiag($"On_Report ConvertandSendReport begin index={ind} count={startupReportCount} outDev={outputDevices[ind]?.GetDeviceType() ?? "null"}");
+                    }
                     outputDevices[ind]?.ConvertandSendReport(cState, ind);
+                    if (startupReportDiag)
+                    {
+                        StartupDiag($"On_Report ConvertandSendReport end index={ind} count={startupReportCount}");
+                    }
                     //testNewReport(ref x360reports[ind], cState, ind);
                     //x360controls[ind]?.SendReport(x360reports[ind]);
 
@@ -3335,10 +3504,26 @@ protected void On_Report(DS4Device device, EventArgs e, int ind)
                 }
 
                 // Output any synthetic events.
+                if (startupReportDiag)
+                {
+                    StartupDiag($"On_Report Mapping.Commit begin index={ind} count={startupReportCount}");
+                }
                 Mapping.Commit(ind);
+                if (startupReportDiag)
+                {
+                    StartupDiag($"On_Report Mapping.Commit end index={ind} count={startupReportCount}");
+                }
 
                 // Update the Lightbar color
+                if (startupReportDiag)
+                {
+                    StartupDiag($"On_Report updateLightBar begin index={ind} count={startupReportCount}");
+                }
                 DS4LightBar.updateLightBar(device, ind);
+                if (startupReportDiag)
+                {
+                    StartupDiag($"On_Report updateLightBar end index={ind} count={startupReportCount}");
+                }
 
                 if (device.PerformStateMerge)
                 {
@@ -3350,6 +3535,11 @@ protected void On_Report(DS4Device device, EventArgs e, int ind)
                     // Copy for use in UDP
                     tempControlState.Motion = device.GetRawCurrentStateRef().Motion;
                 }
+
+                if (startupReportDiag)
+                {
+                    StartupDiag($"On_Report exit index={ind} count={startupReportCount}");
+                }
             }
         }
 
@@ -3707,6 +3897,17 @@ public void LogDebug(String Data, bool warning = false)
             }
         }
 
+        public static void StartupDiag(string data)
+        {
+            if (!Global.VerboseStartupLogging)
+            {
+                return;
+            }
+
+            startupDiagLogger.Info($"[StartupDiag][T{Thread.CurrentThread.ManagedThreadId}] {data}");
+            LogManager.Flush(TimeSpan.FromSeconds(1));
+        }
+
         public void OnDebug(object sender, DebugEventArgs args)
         {
             if (Debug != null)
diff --git a/DS4Windows/DS4Control/DTOXml/AppSettingsDTO.cs b/DS4Windows/DS4Control/DTOXml/AppSettingsDTO.cs
index fd574ed..fad17aa 100644
--- a/DS4Windows/DS4Control/DTOXml/AppSettingsDTO.cs
+++ b/DS4Windows/DS4Control/DTOXml/AppSettingsDTO.cs
@@ -389,6 +389,13 @@ public bool UseAdvancedMoonlight
             set;
         }
 
+        [XmlElement("VerboseStartupLogging")]
+        public bool VerboseStartupLogging
+        {
+            get;
+            set;
+        }
+
         [XmlIgnore]
         public bool CloseMinimizes
         {
@@ -864,6 +871,7 @@ public void MapFrom(BackingStore source)
             QuickCharge = source.quickCharge;
             UseMoonlight = source.useMoonlight;
             UseAdvancedMoonlight = source.useAdvancedMoonlight;
+            VerboseStartupLogging = source.verboseStartupLogging;
             CloseMinimizes = source.closeMini;
             UseLang = source.useLang;
             DownloadLang = source.downloadLang;
@@ -964,6 +972,7 @@ public void MapTo(BackingStore destination)
             destination.quickCharge = QuickCharge;
             destination.useMoonlight = UseMoonlight;
             destination.useAdvancedMoonlight = UseAdvancedMoonlight;
+            destination.verboseStartupLogging = VerboseStartupLogging;
             destination.closeMini = CloseMinimizes;
             destination.useLang = UseLang;
             destination.downloadLang = DownloadLang;
diff --git a/DS4Windows/DS4Control/OutputSlotManager.cs b/DS4Windows/DS4Control/OutputSlotManager.cs
index 63724a0..f90ac85 100644
--- a/DS4Windows/DS4Control/OutputSlotManager.cs
+++ b/DS4Windows/DS4Control/OutputSlotManager.cs
@@ -156,12 +156,14 @@ private int FindEmptySlot()
         public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDisplayString,
             OutputDevice[] outdevs, OutContType contType)
         {
+            ControlService.StartupDiag($"OutputSlotManager.DeferredPlugin enter inIdx={inIdx} contType={contType} outputNull={outputDevice == null}");
             // releases ReaderWriterLockSlim when locker goes out of scope
             using WriteLocker locker = new WriteLocker(queueLocker);
             //queuedTasks++;
             //Action tempAction = new Action(() =>
             {
                 int slot = FindEmptySlot();
+                ControlService.StartupDiag($"OutputSlotManager.DeferredPlugin emptySlot={slot + 1} inIdx={inIdx} contType={contType}");
                 if (slot != -1)
                 {
                     // Only relevant when Virtual Controller (Moonlight) support is on and
@@ -176,10 +178,13 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
 
                     try
                     {
+                        ControlService.StartupDiag($"OutputSlotManager.Connect begin slot={slot + 1} type={contType} output={outputDevice.GetType().Name}");
                         outputDevice.Connect();
+                        ControlService.StartupDiag($"OutputSlotManager.Connect end slot={slot + 1} type={contType}");
                     }
                     catch (Win32Exception e)
                     {
+                        ControlService.StartupDiag($"OutputSlotManager.Connect Win32Exception slot={slot + 1} type={contType} error={e.ErrorCode} message={e.Message}");
                         // Leave task immediately if connect call failed
                         //queuedTasks--;
                         ViGEmFailure?.Invoke(this, e.ErrorCode);
@@ -223,6 +228,11 @@ public void DeferredPlugin(OutputDevice outputDevice, int inIdx, string inDispla
                         outputSlots[slot].CurrentInputBound = OutSlotDevice.InputBound.Bound;
                     }
                     SlotAssigned?.Invoke(this, slot, outputSlots[slot]);
+                    ControlService.StartupDiag($"OutputSlotManager.DeferredPlugin assigned slot={slot + 1} inIdx={inIdx} type={contType}");
+                }
+                else
+                {
+                    ControlService.StartupDiag($"OutputSlotManager.DeferredPlugin no empty slot inIdx={inIdx} type={contType}");
                 }
             };
 
@@ -233,6 +243,7 @@ public void DeferredRemoval(OutputDevice outputDevice, int inIdx,
             OutputDevice[] outdevs, bool immediate = false)
         {
             _ = immediate;
+            ControlService.StartupDiag($"OutputSlotManager.DeferredRemoval enter inIdx={inIdx} outputNull={outputDevice == null}");
 
             // releases ReaderWriterLockSlim when locker goes out of scope
             using WriteLocker locker = new WriteLocker(queueLocker);
@@ -241,13 +252,18 @@ public void DeferredRemoval(OutputDevice outputDevice, int inIdx,
             {
                 if (revDeviceDict.TryGetValue(outputDevice, out int slot))
                 {
+                    ControlService.StartupDiag($"OutputSlotManager.DeferredRemoval found slot={slot + 1} type={outputDevice.GetDeviceType()}");
                     //int slot = revDeviceDict[outputDevice];
                     outputDevices[slot] = null;
                     deviceDict.Remove(slot);
                     revDeviceDict.Remove(outputDevice);
 
+                    ControlService.StartupDiag($"OutputSlotManager.RemoveFeedbacks begin slot={slot + 1}");
                     outputDevice.RemoveFeedbacks();
+                    ControlService.StartupDiag($"OutputSlotManager.RemoveFeedbacks end slot={slot + 1}");
+                    ControlService.StartupDiag($"OutputSlotManager.Disconnect begin slot={slot + 1}");
                     outputDevice.Disconnect();
+                    ControlService.StartupDiag($"OutputSlotManager.Disconnect end slot={slot + 1}");
 
                     if (inIdx != -1)
                     {
@@ -257,12 +273,17 @@ public void DeferredRemoval(OutputDevice outputDevice, int inIdx,
                     outputSlots[slot].DetachDevice();
                     SlotUnassigned?.Invoke(this, slot, outputSlots[slot]);
                     AppLogger.LogToGui($"Unplugging virtual {outputDevice.GetDeviceType()} Controller from output slot #{slot + 1}",false);
+                    ControlService.StartupDiag($"OutputSlotManager.DeferredRemoval unassigned slot={slot + 1}");
 
                     //if (!immediate)
                     //{
                         //    Task.Delay(DELAY_TIME).Wait();
                     //}
                 }
+                else
+                {
+                    ControlService.StartupDiag("OutputSlotManager.DeferredRemoval output not found in reverse map");
+                }
             };
 
             //queuedTasks--;
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index c6297d7..d95370c 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -1691,6 +1691,12 @@ public static bool UseAdvancedMoonlight
             set => m_Config.useAdvancedMoonlight = value;
         }
 
+        public static bool VerboseStartupLogging
+        {
+            get => m_Config.verboseStartupLogging;
+            set => m_Config.verboseStartupLogging = value;
+        }
+
         public static bool getQuickCharge()
         {
             return m_Config.quickCharge;
@@ -3959,6 +3965,7 @@ public void setSZOutCurveMode(int index, int value)
         public bool quickCharge = false;
         public bool useMoonlight = false;
         public bool useAdvancedMoonlight = false;
+        public bool verboseStartupLogging = false;
         public bool closeMini = false;
         public List<SpecialAction> actions = new List<SpecialAction>();
         public List<DS4ControlSettings>[] ds4settings = new List<DS4ControlSettings>[Global.TEST_PROFILE_ITEM_COUNT]
diff --git a/DS4Windows/DS4Control/Xbox360OutDevice.cs b/DS4Windows/DS4Control/Xbox360OutDevice.cs
index 6d24968..6bc7150 100644
--- a/DS4Windows/DS4Control/Xbox360OutDevice.cs
+++ b/DS4Windows/DS4Control/Xbox360OutDevice.cs
@@ -194,7 +194,9 @@ private short AxisScale(Int32 Value, Boolean Flip)
 
         public override void Connect()
         {
+            ControlService.StartupDiag("Xbox360OutDevice.Connect cont.Connect begin");
             cont.Connect();
+            ControlService.StartupDiag("Xbox360OutDevice.Connect cont.Connect end");
             connected = true;
 
             if (_features.HasFlag(X360Features.XInputSlotNum))
@@ -203,10 +205,13 @@ public override void Connect()
                 Thread.Sleep(USER_INDEX_WAIT);
                 try
                 {
+                    ControlService.StartupDiag("Xbox360OutDevice.Connect UserIndex begin");
                     XinputSlotNum = cont.UserIndex;
+                    ControlService.StartupDiag($"Xbox360OutDevice.Connect UserIndex end slot={XinputSlotNum}");
                 }
                 catch (Exception)
                 {
+                    ControlService.StartupDiag("Xbox360OutDevice.Connect UserIndex exception; disabling feature");
                     // Failed to grab xinput slot number. Set default
                     // slot number and remove feature flag
                     _xInputSlotNum = XINPUT_SLOT_NUM_DEFAULT;
@@ -216,6 +221,7 @@ public override void Connect()
         }
         public override void Disconnect()
         {
+            ControlService.StartupDiag("Xbox360OutDevice.Disconnect begin");
             foreach (KeyValuePair<int, Xbox360FeedbackReceivedEventHandler> pair in forceFeedbacksDict)
             {
                 cont.FeedbackReceived -= pair.Value;
@@ -224,8 +230,11 @@ public override void Disconnect()
             forceFeedbacksDict.Clear();
 
             connected = false;
+            ControlService.StartupDiag("Xbox360OutDevice.Disconnect cont.Disconnect begin");
             cont.Disconnect();
+            ControlService.StartupDiag("Xbox360OutDevice.Disconnect cont.Disconnect end");
             cont = null;
+            ControlService.StartupDiag("Xbox360OutDevice.Disconnect end");
         }
         public override string GetDeviceType() => devType;
 
diff --git a/DS4Windows/DS4Forms/MainWindow.xaml b/DS4Windows/DS4Forms/MainWindow.xaml
index 5f36ee4..e9ddebb 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml
+++ b/DS4Windows/DS4Forms/MainWindow.xaml
@@ -311,6 +311,9 @@
                         <CheckBox Content="{lex:Loc QuickCharge}" Margin="{StaticResource spaceMargin}"
                               IsChecked="{Binding QuickCharge}"
                               ToolTip="{lex:Loc Resources:QuickCharge}" />
+                        <CheckBox Content="Enable startup diagnostics" Margin="{StaticResource spaceMargin}"
+                              IsChecked="{Binding VerboseStartupLogging}"
+                              ToolTip="Writes detailed startup diagnostic markers to the log. Disable after testing." />
                         <StackPanel Orientation="Horizontal" Margin="{StaticResource spaceMargin}">
                             <Label Content="{lex:Loc IconChoice}" ContentStringFormat="{}{0}:"/>
                             <ComboBox x:Name="useIconChoiceCom" SelectedIndex="{Binding IconChoiceIndex,FallbackValue='0'}" Margin="10,0,0,0">
diff --git a/DS4Windows/DS4Forms/MainWindow.xaml.cs b/DS4Windows/DS4Forms/MainWindow.xaml.cs
index ef6ec6f..527bd4c 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml.cs
+++ b/DS4Windows/DS4Forms/MainWindow.xaml.cs
@@ -189,9 +189,13 @@ public MainWindow(ArgumentParser parser)
 
         public void LateChecks(ArgumentParser parser)
         {
+            ControlService.StartupDiag($"MainWindow.LateChecks scheduled stopArg={parser.Stop}");
             Task tempTask = Task.Run(() =>
             {
+                ControlService.StartupDiag("MainWindow.LateChecks task begin");
+                ControlService.StartupDiag("MainWindow.CheckDrivers begin");
                 mainWinVM.CheckDrivers();
+                ControlService.StartupDiag("MainWindow.CheckDrivers end");
                 if (!parser.Stop)
                 {
                     Dispatcher.BeginInvoke((Action)(() =>
@@ -199,9 +203,12 @@ public void LateChecks(ArgumentParser parser)
                         StartStopBtn.IsEnabled = false;
                     }));
                     Thread.Sleep(1000);
+                    ControlService.StartupDiag("rootHub.Start begin from LateChecks");
                     App.rootHub.Start();
+                    ControlService.StartupDiag("rootHub.Start end from LateChecks");
                     //root.rootHubtest.Start();
                 }
+                ControlService.StartupDiag("MainWindow.LateChecks task end");
             });
 
             // Log exceptions that might occur
diff --git a/DS4Windows/DS4Forms/ViewModels/SettingsViewModel.cs b/DS4Windows/DS4Forms/ViewModels/SettingsViewModel.cs
index 7b57d4f..3aed58f 100644
--- a/DS4Windows/DS4Forms/ViewModels/SettingsViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/SettingsViewModel.cs
@@ -143,6 +143,20 @@ public int ShowNotificationsIndex
         public bool MinimizeToTaskbar { get => DS4Windows.Global.MinToTaskbar; set => DS4Windows.Global.MinToTaskbar = value; }
         public bool CloseMinimizes { get => DS4Windows.Global.CloseMini; set => DS4Windows.Global.CloseMini = value; }
         public bool QuickCharge { get => DS4Windows.Global.QuickCharge; set => DS4Windows.Global.QuickCharge = value; }
+        public bool VerboseStartupLogging
+        {
+            get => DS4Windows.Global.VerboseStartupLogging;
+            set
+            {
+                if (DS4Windows.Global.VerboseStartupLogging == value)
+                {
+                    return;
+                }
+
+                DS4Windows.Global.VerboseStartupLogging = value;
+                DS4Windows.Global.Save();
+            }
+        }
 
         public int IconChoiceIndex
         {

From bc7a76c8edaa23c51ed97dcbb1cfe04663190623 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 11:18:53 -0500
Subject: [PATCH 29/47] Move Game Bar profile polling off report thread

---
 DS4Windows/DS4Control/ControlService.cs | 176 ++++++++++++++++++------
 1 file changed, 131 insertions(+), 45 deletions(-)

diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 0c6533b..444d231 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -70,6 +70,8 @@ public class ControlService
         bool[] held = new bool[MAX_DS4_CONTROLLER_COUNT];
         int[] oldmouse = new int[MAX_DS4_CONTROLLER_COUNT] { -1, -1, -1, -1, -1, -1, -1, -1 };
         private int[] startupReportDiagCounts = new int[MAX_DS4_CONTROLLER_COUNT];
+        private System.Threading.Timer gameBarProfileTimer;
+        private int gameBarProfileUpdateGate = 0;
         public OutputDevice[] outputDevices = new OutputDevice[MAX_DS4_CONTROLLER_COUNT] { null, null, null, null, null, null, null, null };
         private OneEuroFilter3D[] udpEuroPairAccel = new OneEuroFilter3D[UdpServer.NUMBER_SLOTS]
         {
@@ -1918,6 +1920,7 @@ public bool Start(bool showlog = true)
 
                 StartupDiag("ControlService.Start setting running=true");
                 running = true;
+                StartGameBarProfileTimer();
 
                 if (_udpServer != null)
                 {
@@ -2051,6 +2054,7 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
                 running = false;
                 runHotPlug = false;
                 inServiceTask = true;
+                StopGameBarProfileTimer();
                 StartupDiag("ControlService.Stop PreServiceStop begin");
                 PreServiceStop?.Invoke(this, EventArgs.Empty);
                 StartupDiag("ControlService.Stop PreServiceStop end");
@@ -3110,64 +3114,85 @@ private void CheckGameBarHomeButton(int ind, DS4State cState, DS4State tempContr
 
         public void UpdateGameBarProfileState()
         {
-            bool anyActiveOrPending = IsAnyGameBarProfilePriorityActive();
-            bool anyConfigured = HasAnyConfiguredGameBarProfile();
-
-            if (!anyActiveOrPending && !anyConfigured)
+            if (!running)
             {
                 return;
             }
 
-            DateTime now = DateTime.UtcNow;
-            if (now - gameBarLastVisibilityCheckUtc < TimeSpan.FromMilliseconds(350))
+            if (Interlocked.Exchange(ref gameBarProfileUpdateGate, 1) == 1)
             {
                 return;
             }
 
-            gameBarLastVisibilityCheckUtc = now;
-            bool gameBarVisible = gameBarIntegration.IsGameBarVisible();
-            if (gameBarVisible)
+            try
             {
-                gameBarLastVisibleUtc = now;
-                gameBarInvisibleSinceUtc = DateTime.MinValue;
-                RequestVisibleGameBarProfiles(now);
-                ActivatePendingGameBarProfiles(now);
-                return;
-            }
+                bool anyActiveOrPending = IsAnyGameBarProfilePriorityActive();
+                bool anyConfigured = HasAnyConfiguredGameBarProfile();
 
-            if (gameBarInvisibleSinceUtc == DateTime.MinValue)
-            {
-                gameBarInvisibleSinceUtc = now;
-            }
+                if (!anyActiveOrPending && !anyConfigured)
+                {
+                    return;
+                }
 
-            for (int i = 0; i < MAX_DS4_CONTROLLER_COUNT; i++)
-            {
-                if (gameBarProfilePending[i] && now - gameBarProfileRequestedUtc[i] > TimeSpan.FromSeconds(6))
+                DateTime now = DateTime.UtcNow;
+                if (now - gameBarLastVisibilityCheckUtc < TimeSpan.FromMilliseconds(350))
                 {
-                    ClearPendingGameBarProfile(i);
+                    return;
                 }
 
-                if (!gameBarProfileActive[i])
+                gameBarLastVisibilityCheckUtc = now;
+                bool gameBarVisible = gameBarIntegration.IsGameBarVisible();
+                if (gameBarVisible)
                 {
-                    continue;
+                    gameBarLastVisibleUtc = now;
+                    gameBarInvisibleSinceUtc = DateTime.MinValue;
+                    RequestVisibleGameBarProfiles(now);
+                    ActivatePendingGameBarProfiles(now);
+                    return;
                 }
 
-                bool activationGraceElapsed = now - gameBarProfileActivatedUtc[i] > TimeSpan.FromSeconds(3);
-                bool visibilityGraceElapsed = gameBarLastVisibleUtc == DateTime.MinValue ||
-                    now - gameBarLastVisibleUtc > TimeSpan.FromMilliseconds(1500);
-                bool invisibleStable = gameBarInvisibleSinceUtc != DateTime.MinValue &&
-                    now - gameBarInvisibleSinceUtc > TimeSpan.FromMilliseconds(1500);
+                if (gameBarInvisibleSinceUtc == DateTime.MinValue)
+                {
+                    gameBarInvisibleSinceUtc = now;
+                }
 
-                if (activationGraceElapsed && visibilityGraceElapsed && invisibleStable)
+                for (int i = 0; i < MAX_DS4_CONTROLLER_COUNT; i++)
                 {
-                    RestorePreviousGameBarProfile(i);
-                    gameBarProfileActive[i] = false;
-                    gameBarPreviousUseTempProfile[i] = false;
-                    gameBarPreviousTempProfileName[i] = string.Empty;
-                    gameBarPreviousProfileName[i] = string.Empty;
-                    gameBarRequestedProfileName[i] = string.Empty;
+                    if (gameBarProfilePending[i] && now - gameBarProfileRequestedUtc[i] > TimeSpan.FromSeconds(6))
+                    {
+                        ClearPendingGameBarProfile(i);
+                    }
+
+                    if (!gameBarProfileActive[i])
+                    {
+                        continue;
+                    }
+
+                    bool activationGraceElapsed = now - gameBarProfileActivatedUtc[i] > TimeSpan.FromSeconds(3);
+                    bool visibilityGraceElapsed = gameBarLastVisibleUtc == DateTime.MinValue ||
+                        now - gameBarLastVisibleUtc > TimeSpan.FromMilliseconds(1500);
+                    bool invisibleStable = gameBarInvisibleSinceUtc != DateTime.MinValue &&
+                        now - gameBarInvisibleSinceUtc > TimeSpan.FromMilliseconds(1500);
+
+                    if (activationGraceElapsed && visibilityGraceElapsed && invisibleStable &&
+                        RestorePreviousGameBarProfile(i))
+                    {
+                        gameBarProfileActive[i] = false;
+                        gameBarPreviousUseTempProfile[i] = false;
+                        gameBarPreviousTempProfileName[i] = string.Empty;
+                        gameBarPreviousProfileName[i] = string.Empty;
+                        gameBarRequestedProfileName[i] = string.Empty;
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                StartupDiag($"UpdateGameBarProfileState exception {ex.GetType().Name}: {ex.Message}");
+            }
+            finally
+            {
+                Interlocked.Exchange(ref gameBarProfileUpdateGate, 0);
+            }
         }
 
         private void RequestVisibleGameBarProfiles(DateTime now)
@@ -3196,7 +3221,20 @@ private void ActivatePendingGameBarProfiles(DateTime now)
                 }
 
                 string profileName = gameBarRequestedProfileName[i];
-                if (!string.IsNullOrEmpty(profileName) && Global.LoadTempProfile(i, profileName, false, this))
+                bool actionRan = true;
+                bool profileLoaded = false;
+                if (!string.IsNullOrEmpty(profileName))
+                {
+                    actionRan = RunProfileActionWithReportingPaused(i,
+                        () => profileLoaded = Global.LoadTempProfile(i, profileName, false, this));
+                }
+
+                if (!actionRan)
+                {
+                    continue;
+                }
+
+                if (profileLoaded)
                 {
                     gameBarProfileActive[i] = true;
                     gameBarProfileActivatedUtc[i] = now;
@@ -3220,13 +3258,25 @@ private void ClearPendingGameBarProfile(int ind)
             }
         }
 
-        private void RestorePreviousGameBarProfile(int ind)
+        private bool RestorePreviousGameBarProfile(int ind)
         {
+            bool actionRan = true;
+            bool restored = false;
+
             if (gameBarPreviousUseTempProfile[ind] &&
-                !string.IsNullOrEmpty(gameBarPreviousTempProfileName[ind]) &&
-                Global.LoadTempProfile(ind, gameBarPreviousTempProfileName[ind], false, this))
+                !string.IsNullOrEmpty(gameBarPreviousTempProfileName[ind]))
             {
-                return;
+                actionRan = RunProfileActionWithReportingPaused(ind,
+                    () => restored = Global.LoadTempProfile(ind, gameBarPreviousTempProfileName[ind], false, this));
+                if (!actionRan)
+                {
+                    return false;
+                }
+
+                if (restored)
+                {
+                    return true;
+                }
             }
 
             string previousProfileName = gameBarPreviousProfileName[ind];
@@ -3236,7 +3286,45 @@ private void RestorePreviousGameBarProfile(int ind)
                 Global.OlderProfilePath[ind] = previousProfileName;
             }
 
-            Global.LoadProfile(ind, false, this);
+            actionRan = RunProfileActionWithReportingPaused(ind,
+                () => restored = Global.LoadProfile(ind, false, this));
+            return actionRan && restored;
+        }
+
+        private bool RunProfileActionWithReportingPaused(int ind, Action action)
+        {
+            DS4Device device = ind >= 0 && ind < DS4Controllers.Length ? DS4Controllers[ind] : null;
+            if (device == null)
+            {
+                action?.Invoke();
+                return true;
+            }
+
+            bool actionRan = false;
+            device.HaltReportingRunAction(() =>
+            {
+                actionRan = true;
+                action?.Invoke();
+            });
+
+            return actionRan;
+        }
+
+        private void StartGameBarProfileTimer()
+        {
+            if (gameBarProfileTimer != null)
+            {
+                return;
+            }
+
+            gameBarProfileTimer = new System.Threading.Timer(_ => UpdateGameBarProfileState(),
+                null, TimeSpan.FromMilliseconds(350), TimeSpan.FromMilliseconds(350));
+        }
+
+        private void StopGameBarProfileTimer()
+        {
+            System.Threading.Timer timer = Interlocked.Exchange(ref gameBarProfileTimer, null);
+            timer?.Dispose();
         }
 
         // Called every time a new input report has arrived
@@ -3304,8 +3392,6 @@ protected void On_Report(DS4Device device, EventArgs e, int ind)
                 //device.getPreviousState(PreviousState[ind]);
                 //DS4State pState = PreviousState[ind];
 
-                UpdateGameBarProfileState();
-
                 if (device.firstReport && device.isSynced())
                 {
                     // Only send Log message when device is considered a primary device

From 38d94e25f470cf868fcea5fd02927680bbdfd71b Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 11:22:44 -0500
Subject: [PATCH 30/47] Marshal tray battery updates to UI thread

---
 DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs b/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
index 998d827..3857802 100644
--- a/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
@@ -426,6 +426,13 @@ public void ClearContextMenu()
 
         private void UpdateTrayBattery(object sender, byte percentage)
         {
+            if (Application.Current?.Dispatcher != null &&
+                !Application.Current.Dispatcher.CheckAccess())
+            {
+                Application.Current.Dispatcher.BeginInvoke((Action)(() => UpdateTrayBattery(sender, percentage)));
+                return;
+            }
+
             IconSource = percentage switch
             {
                 < 10 => $"{Global.RESOURCES_PREFIX}/0.ico",

From 201ce69becbed76b9f899c0188216d3526a85c98 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 11:35:14 -0500
Subject: [PATCH 31/47] Harden virtual output shutdown and relaunch

---
 DS4Windows/App.xaml.cs                        | 41 +++++++++++++++++--
 DS4Windows/DS4Control/ControlService.cs       | 23 ++++++++---
 DS4Windows/DS4Control/DS4OutDevice.cs         | 38 +++++++++++++----
 .../DS4OutDevices/DS4OutDeviceExt.cs          | 14 ++++++-
 DS4Windows/DS4Control/OutputSlotManager.cs    | 11 ++++-
 DS4Windows/DS4Control/Xbox360OutDevice.cs     | 34 +++++++++++----
 6 files changed, 132 insertions(+), 29 deletions(-)

diff --git a/DS4Windows/App.xaml.cs b/DS4Windows/App.xaml.cs
index 1c6dd72..fc51b69 100644
--- a/DS4Windows/App.xaml.cs
+++ b/DS4Windows/App.xaml.cs
@@ -95,6 +95,19 @@ private void Application_Startup(object sender, StartupEventArgs e)
             parser.Parse(e.Args);
             CheckOptions(parser);
 
+            try
+            {
+                string exeDir = Path.GetDirectoryName(DS4Windows.Global.exelocation);
+                if (!string.IsNullOrEmpty(exeDir))
+                {
+                    Environment.CurrentDirectory = exeDir;
+                }
+            }
+            catch
+            {
+                // Keep startup going. A bad working directory should not block DS4Windows.
+            }
+
             if (exitApp)
             {
                 return;
@@ -822,16 +835,28 @@ private void CleanShutdown()
         {
             if (runShutdown)
             {
+                bool shutdownTimedOut = false;
                 if (rootHub != null)
                 {
-                    Task.Run(() =>
+                    Task shutdownTask = Task.Run(() =>
                     {
                         if (rootHub.running)
                         {
                             rootHub.Stop(immediateUnplug: true, disposeViGEm: false);
                             rootHub.ShutDown();
                         }
-                    }).Wait();
+                    });
+
+                    if (!shutdownTask.Wait(TimeSpan.FromSeconds(8)))
+                    {
+                        shutdownTimedOut = true;
+                        try
+                        {
+                            logHolder?.Logger?.Warn("Timed out while stopping controller service during shutdown. Forcing process exit to avoid a stale single-instance lock.");
+                            rootHub.PrepareAbort();
+                        }
+                        catch { }
+                    }
                 }
 
                 if (!skipSave)
@@ -846,8 +871,11 @@ private void CleanShutdown()
                 if (threadComEvent != null)
                 {
                     threadComEvent.Set();  // signal the other instance.
-                    while (testThread.IsAlive)
-                        Thread.SpinWait(500);
+                    if (testThread != null && !testThread.Join(2000))
+                    {
+                        shutdownTimedOut = true;
+                        logHolder?.Logger?.Warn("Timed out waiting for single-instance worker thread to exit.");
+                    }
                     threadComEvent.Close();
                 }
 
@@ -855,6 +883,11 @@ private void CleanShutdown()
 
                 LogManager.Flush();
                 LogManager.Shutdown();
+
+                if (shutdownTimedOut)
+                {
+                    Environment.Exit(0);
+                }
             }
         }
     }
diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index 444d231..fb12a7a 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -2091,10 +2091,14 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
                         }
                         else
                         {
-                            DS4LightBar.forcelight[i] = false;
-                            DS4LightBar.forcedFlash[i] = 0;
-                            DS4LightBar.defaultLight = true;
-                            DS4LightBar.updateLightBar(DS4Controllers[i], i);
+                            if (!immediateUnplug)
+                            {
+                                DS4LightBar.forcelight[i] = false;
+                                DS4LightBar.forcedFlash[i] = 0;
+                                DS4LightBar.defaultLight = true;
+                                DS4LightBar.updateLightBar(DS4Controllers[i], i);
+                            }
+
                             tempDevice.IsRemoved = true;
                             tempDevice.StopUpdate();
                             DS4Devices.RemoveDevice(tempDevice);
@@ -2157,10 +2161,17 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
                 if (showlog)
                     LogDebug(DS4WinWPF.Properties.Resources.StoppedDS4Windows);
 
-                while (outputslotMan.RunningQueue)
+                Stopwatch outputQueueWait = Stopwatch.StartNew();
+                while (outputslotMan.RunningQueue && outputQueueWait.ElapsedMilliseconds < 2000)
                 {
-                    Thread.SpinWait(500);
+                    Thread.Sleep(1);
                 }
+
+                if (outputslotMan.RunningQueue)
+                {
+                    StartupDiag("ControlService.Stop timed out waiting for output slot queue");
+                }
+
                 StartupDiag("ControlService.Stop outputslotMan.Stop begin");
                 outputslotMan.Stop(true);
                 StartupDiag("ControlService.Stop outputslotMan.Stop end");
diff --git a/DS4Windows/DS4Control/DS4OutDevice.cs b/DS4Windows/DS4Control/DS4OutDevice.cs
index ba6f475..28e088e 100644
--- a/DS4Windows/DS4Control/DS4OutDevice.cs
+++ b/DS4Windows/DS4Control/DS4OutDevice.cs
@@ -57,18 +57,41 @@ public override void Connect()
         }
         public override void Disconnect()
         {
-            // Remove feedback handlers before Disconnect
-            RemoveFeedbacks();
+            try
+            {
+                // Remove feedback handlers before Disconnect
+                RemoveFeedbacks();
+            }
+            catch (Exception ex)
+            {
+                ControlService.StartupDiag($"DS4OutDevice.RemoveFeedbacks exception {ex.GetType().Name}: {ex.Message}");
+            }
 
-            connected = false;
-            cont.Disconnect();
-            //cont.Dispose();
-            cont = null;
+            try
+            {
+                cont?.Disconnect();
+            }
+            catch (Exception ex)
+            {
+                ControlService.StartupDiag($"DS4OutDevice.Disconnect exception {ex.GetType().Name}: {ex.Message}");
+            }
+            finally
+            {
+                connected = false;
+                //cont.Dispose();
+                cont = null;
+            }
         }
         public override string GetDeviceType() => devtype;
 
         public override void RemoveFeedbacks()
         {
+            if (cont == null)
+            {
+                forceFeedbacksDict.Clear();
+                return;
+            }
+
             foreach (KeyValuePair<int, DualShock4FeedbackReceivedEventHandler> pair in forceFeedbacksDict)
             {
                 cont.FeedbackReceived -= pair.Value;
@@ -79,7 +102,8 @@ public override void RemoveFeedbacks()
 
         public override void RemoveFeedback(int inIdx)
         {
-            if (forceFeedbacksDict.TryGetValue(inIdx, out DualShock4FeedbackReceivedEventHandler handler))
+            if (cont != null &&
+                forceFeedbacksDict.TryGetValue(inIdx, out DualShock4FeedbackReceivedEventHandler handler))
             {
                 cont.FeedbackReceived -= handler;
                 forceFeedbacksDict.Remove(inIdx);
diff --git a/DS4Windows/DS4Control/DS4OutDevices/DS4OutDeviceExt.cs b/DS4Windows/DS4Control/DS4OutDevices/DS4OutDeviceExt.cs
index aa24b44..86dd2dd 100644
--- a/DS4Windows/DS4Control/DS4OutDevices/DS4OutDeviceExt.cs
+++ b/DS4Windows/DS4Control/DS4OutDevices/DS4OutDeviceExt.cs
@@ -333,14 +333,24 @@ public override void Disconnect()
             {
                 if (awaitOutBuffThread != null)
                 {
-                    if (!awaitOutBuffThread.ThreadState.HasFlag(ThreadState.WaitSleepJoin))
+                    try
                     {
                         awaitOutBuffThread.Interrupt();
                     }
+                    catch
+                    {
+                    }
 
-                    awaitOutBuffThread.Join();
+                    if (!awaitOutBuffThread.Join(1000))
+                    {
+                        ControlService.StartupDiag("DS4OutDeviceExt.Disconnect output-buffer thread did not exit before timeout");
+                    }
                 }
             }
+
+            tokenSource?.Dispose();
+            tokenSource = null;
+            awaitOutBuffThread = null;
         }
     }
 }
diff --git a/DS4Windows/DS4Control/OutputSlotManager.cs b/DS4Windows/DS4Control/OutputSlotManager.cs
index f90ac85..8f8cb98 100644
--- a/DS4Windows/DS4Control/OutputSlotManager.cs
+++ b/DS4Windows/DS4Control/OutputSlotManager.cs
@@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -101,9 +102,15 @@ public void ShutDown()
         public void Stop(bool immediate = false)
         {
             UnplugRemainingControllers(immediate);
-            while (RunningQueue)
+            Stopwatch queueWait = Stopwatch.StartNew();
+            while (RunningQueue && queueWait.ElapsedMilliseconds < 2000)
             {
-                Thread.SpinWait(500);
+                Thread.Sleep(1);
+            }
+
+            if (RunningQueue)
+            {
+                ControlService.StartupDiag("OutputSlotManager.Stop timed out waiting for queued output task");
             }
 
             deviceDict.Clear();
diff --git a/DS4Windows/DS4Control/Xbox360OutDevice.cs b/DS4Windows/DS4Control/Xbox360OutDevice.cs
index 6bc7150..bad9e3b 100644
--- a/DS4Windows/DS4Control/Xbox360OutDevice.cs
+++ b/DS4Windows/DS4Control/Xbox360OutDevice.cs
@@ -222,18 +222,32 @@ public override void Connect()
         public override void Disconnect()
         {
             ControlService.StartupDiag("Xbox360OutDevice.Disconnect begin");
-            foreach (KeyValuePair<int, Xbox360FeedbackReceivedEventHandler> pair in forceFeedbacksDict)
+            if (cont != null)
             {
-                cont.FeedbackReceived -= pair.Value;
+                foreach (KeyValuePair<int, Xbox360FeedbackReceivedEventHandler> pair in forceFeedbacksDict)
+                {
+                    cont.FeedbackReceived -= pair.Value;
+                }
             }
 
             forceFeedbacksDict.Clear();
 
             connected = false;
             ControlService.StartupDiag("Xbox360OutDevice.Disconnect cont.Disconnect begin");
-            cont.Disconnect();
-            ControlService.StartupDiag("Xbox360OutDevice.Disconnect cont.Disconnect end");
-            cont = null;
+            try
+            {
+                cont?.Disconnect();
+                ControlService.StartupDiag("Xbox360OutDevice.Disconnect cont.Disconnect end");
+            }
+            catch (Exception ex)
+            {
+                ControlService.StartupDiag($"Xbox360OutDevice.Disconnect exception {ex.GetType().Name}: {ex.Message}");
+            }
+            finally
+            {
+                cont = null;
+            }
+
             ControlService.StartupDiag("Xbox360OutDevice.Disconnect end");
         }
         public override string GetDeviceType() => devType;
@@ -249,9 +263,12 @@ public override void ResetState(bool submit=true)
 
         public override void RemoveFeedbacks()
         {
-            foreach (KeyValuePair<int, Xbox360FeedbackReceivedEventHandler> pair in forceFeedbacksDict)
+            if (cont != null)
             {
-                cont.FeedbackReceived -= pair.Value;
+                foreach (KeyValuePair<int, Xbox360FeedbackReceivedEventHandler> pair in forceFeedbacksDict)
+                {
+                    cont.FeedbackReceived -= pair.Value;
+                }
             }
 
             forceFeedbacksDict.Clear();
@@ -259,7 +276,8 @@ public override void RemoveFeedbacks()
 
         public override void RemoveFeedback(int inIdx)
         {
-            if (forceFeedbacksDict.TryGetValue(inIdx, out Xbox360FeedbackReceivedEventHandler handler))
+            if (cont != null &&
+                forceFeedbacksDict.TryGetValue(inIdx, out Xbox360FeedbackReceivedEventHandler handler))
             {
                 cont.FeedbackReceived -= handler;
                 forceFeedbacksDict.Remove(inIdx);

From e168c9863c08c62e719cc3bdef08886806276af5 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 11:58:53 -0500
Subject: [PATCH 32/47] Harden Game Bar and auto profile polling

---
 DS4Windows/AutoProfileChecker.cs            |  56 +++++++--
 DS4Windows/DS4Control/GameBarIntegration.cs | 123 +++++++++++++++++---
 DS4Windows/DS4Forms/MainWindow.xaml.cs      |   2 -
 3 files changed, 154 insertions(+), 27 deletions(-)

diff --git a/DS4Windows/AutoProfileChecker.cs b/DS4Windows/AutoProfileChecker.cs
index ce37257..d90f486 100644
--- a/DS4Windows/AutoProfileChecker.cs
+++ b/DS4Windows/AutoProfileChecker.cs
@@ -35,6 +35,8 @@ namespace DS4WinWPF
     [SuppressUnmanagedCodeSecurity]
     public class AutoProfileChecker
     {
+        private const uint PROCESS_QUERY_LIMITED_INFORMATION = 0x1000;
+
         private AutoProfileHolder profileHolder;
         private IntPtr prevForegroundWnd = IntPtr.Zero;
         private uint prevForegroundProcessID;
@@ -311,7 +313,6 @@ private bool GetTopWindowName(out string topProcessName, out string topWndTitleN
 
             prevForegroundWnd = hWnd;
 
-            IntPtr hProcess = IntPtr.Zero;
             uint lpdwProcessId = 0;
             GetWindowThreadProcessId(hWnd, out lpdwProcessId);
 
@@ -322,26 +323,59 @@ private bool GetTopWindowName(out string topProcessName, out string topWndTitleN
             else
             {
                 prevForegroundProcessID = lpdwProcessId;
-
-                hProcess = OpenProcess(0x0410, false, lpdwProcessId);
-                if (hProcess != IntPtr.Zero) GetModuleFileNameEx(hProcess, IntPtr.Zero, autoProfileCheckTextBuilder, autoProfileCheckTextBuilder.Capacity);
-                else autoProfileCheckTextBuilder.Clear();
-
-                prevForegroundProcessName = topProcessName = autoProfileCheckTextBuilder.Replace('/', '\\').ToString().ToLower();
+                prevForegroundProcessName = topProcessName = GetProcessExecutablePath(lpdwProcessId)
+                    .Replace('/', '\\')
+                    .ToLower();
             }
 
             GetWindowText(hWnd, autoProfileCheckTextBuilder, autoProfileCheckTextBuilder.Capacity);
             prevForegroundWndTitleName = topWndTitleName = autoProfileCheckTextBuilder.ToString().ToLower();
 
 
-            if (hProcess != IntPtr.Zero) CloseHandle(hProcess);
-
             if (autoProfileDebugLogLevel > 0)
                 DS4Windows.AppLogger.LogToGui($"DEBUG: Auto-Profile. PID={lpdwProcessId}  Path={topProcessName} | WND={hWnd}  Title={topWndTitleName}", false, true);
 
             return true;
         }
 
+        private static string GetProcessExecutablePath(uint processId)
+        {
+            if (processId == 0)
+            {
+                return string.Empty;
+            }
+
+            IntPtr hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, false, processId);
+            if (hProcess != IntPtr.Zero)
+            {
+                try
+                {
+                    StringBuilder builder = new StringBuilder(1000);
+                    int size = builder.Capacity;
+                    if (QueryFullProcessImageName(hProcess, 0, builder, ref size) && size > 0)
+                    {
+                        return builder.ToString();
+                    }
+                }
+                finally
+                {
+                    CloseHandle(hProcess);
+                }
+            }
+
+            try
+            {
+                using (Process process = Process.GetProcessById((int)processId))
+                {
+                    return process.ProcessName + ".exe";
+                }
+            }
+            catch
+            {
+                return string.Empty;
+            }
+        }
+
         private static unsafe string GetWindowTitle(HWND handle)
         {
             var strLength = PInvoke.GetWindowTextLength(handle) + 1;
@@ -413,8 +447,8 @@ private void DisplayProfileChange(int ind, string profile)
         [DllImport("kernel32.dll")]
         private static extern bool CloseHandle(IntPtr handle);
 
-        [DllImport("psapi.dll")]
-        private static extern uint GetModuleFileNameEx(IntPtr hWnd, IntPtr hModule, StringBuilder lpFileName, int nSize);
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        private static extern bool QueryFullProcessImageName(IntPtr hProcess, int dwFlags, StringBuilder lpExeName, ref int lpdwSize);
 
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
         private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nSize);
diff --git a/DS4Windows/DS4Control/GameBarIntegration.cs b/DS4Windows/DS4Control/GameBarIntegration.cs
index 8183761..f9c67f9 100644
--- a/DS4Windows/DS4Control/GameBarIntegration.cs
+++ b/DS4Windows/DS4Control/GameBarIntegration.cs
@@ -22,6 +22,7 @@ You should have received a copy of the GNU General Public License
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Text;
+using System.Threading;
 using System.Windows.Automation;
 using Windows.Foundation.Metadata;
 using Windows.Gaming.UI;
@@ -39,7 +40,14 @@ public class GameBarIntegration
         private const int MaxAutomationVisitCount = 500;
         private const int MaxAutomationDepth = 5;
         private const int MaxDiagnosticTextLength = 160;
+        private const int LiveAutomationPollMs = 1000;
+        private const int LiveAutomationCacheMs = 3000;
         private static bool? gameBarApiPresent;
+        private static readonly object automationPollLock = new object();
+        private static bool automationPollRunning;
+        private static bool automationPollCachedVisible;
+        private static DateTime automationPollLastStartedUtc = DateTime.MinValue;
+        private static DateTime automationPollLastCompletedUtc = DateTime.MinValue;
 
         private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
 
@@ -105,30 +113,87 @@ public string OpenGameBar()
 
         public bool IsGameBarVisible()
         {
-            if (TryGetGameBarApiState(out bool apiVisible, out bool apiInputRedirected, out _))
+            if (IsGameBarVisibleByWindowEnumeration())
             {
-                return apiVisible || apiInputRedirected;
+                return true;
             }
 
+            return IsGameBarVisibleByCachedAutomation();
+        }
+
+        private static bool IsGameBarVisibleByWindowEnumeration()
+        {
             bool visible = false;
 
-            EnumWindows((hWnd, lParam) =>
+            try
             {
-                if (!IsInspectableWindow(hWnd))
+                EnumWindows((hWnd, lParam) =>
                 {
+                    if (!IsInspectableWindow(hWnd))
+                    {
+                        return true;
+                    }
+
+                    if (LooksLikeGameBarWindow(hWnd) || HasGameBarChildWindow(hWnd))
+                    {
+                        visible = true;
+                        return false;
+                    }
+
                     return true;
-                }
+                }, IntPtr.Zero);
+            }
+            catch
+            {
+                visible = false;
+            }
+
+            return visible;
+        }
 
-                if (LooksLikeGameBarWindow(hWnd) || HasGameBarChildWindow(hWnd))
+        private static bool IsGameBarVisibleByCachedAutomation()
+        {
+            DateTime now = DateTime.UtcNow;
+            lock (automationPollLock)
+            {
+                bool cachedResultIsFresh = automationPollCachedVisible &&
+                    now - automationPollLastCompletedUtc < TimeSpan.FromMilliseconds(LiveAutomationCacheMs);
+
+                if (!automationPollRunning &&
+                    now - automationPollLastStartedUtc >= TimeSpan.FromMilliseconds(LiveAutomationPollMs))
                 {
-                    visible = true;
-                    return false;
-                }
+                    automationPollRunning = true;
+                    automationPollLastStartedUtc = now;
 
-                return true;
-            }, IntPtr.Zero);
+                    Thread worker = new Thread(() =>
+                    {
+                        bool visible = false;
+                        try
+                        {
+                            visible = IsGameBarVisibleByAutomation();
+                        }
+                        catch
+                        {
+                            visible = false;
+                        }
+                        finally
+                        {
+                            lock (automationPollLock)
+                            {
+                                automationPollCachedVisible = visible;
+                                automationPollLastCompletedUtc = DateTime.UtcNow;
+                                automationPollRunning = false;
+                            }
+                        }
+                    });
+
+                    worker.IsBackground = true;
+                    worker.Name = "DS4Windows Game Bar UIA Poll";
+                    worker.Start();
+                }
 
-            return visible || IsGameBarVisibleByAutomation();
+                return cachedResultIsFresh;
+            }
         }
 
         public string GetGameBarWindowDiagnostics()
@@ -172,7 +237,7 @@ public string GetGameBarStateDiagnostics()
             return $"GameBarVisible={IsGameBarVisible()} Elevated={IsRunningElevated()}\n{GetGameBarApiDiagnostics()}";
         }
 
-        private static bool TryGetGameBarApiState(out bool visible, out bool inputRedirected, out string status)
+        private static bool TryGetGameBarApiStateCore(out bool visible, out bool inputRedirected, out string status)
         {
             visible = false;
             inputRedirected = false;
@@ -200,10 +265,40 @@ private static bool TryGetGameBarApiState(out bool visible, out bool inputRedire
 
         private static string GetGameBarApiDiagnostics()
         {
-            bool supported = TryGetGameBarApiState(out bool visible, out bool inputRedirected, out string status);
+            bool supported = TryGetGameBarApiState(500, out bool visible, out bool inputRedirected, out string status);
             return $"GameBarApi supported={supported} visible={visible} inputRedirected={inputRedirected} status='{TruncateDiagnosticText(status)}'";
         }
 
+        private static bool TryGetGameBarApiState(int timeoutMs, out bool visible, out bool inputRedirected, out string status)
+        {
+            bool apiSupported = false;
+            bool apiVisible = false;
+            bool apiInputRedirected = false;
+            string apiStatus = "not started";
+
+            Thread worker = new Thread(() =>
+            {
+                apiSupported = TryGetGameBarApiStateCore(out apiVisible, out apiInputRedirected, out apiStatus);
+            });
+
+            worker.IsBackground = true;
+            worker.Name = "DS4Windows Game Bar API Probe";
+            worker.Start();
+
+            if (!worker.Join(timeoutMs))
+            {
+                visible = false;
+                inputRedirected = false;
+                status = $"timeout after {timeoutMs}ms";
+                return false;
+            }
+
+            visible = apiVisible;
+            inputRedirected = apiInputRedirected;
+            status = apiStatus;
+            return apiSupported;
+        }
+
         private static bool IsGameBarVisibleByAutomation()
         {
             try
diff --git a/DS4Windows/DS4Forms/MainWindow.xaml.cs b/DS4Windows/DS4Forms/MainWindow.xaml.cs
index 527bd4c..ac527f3 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml.cs
+++ b/DS4Windows/DS4Forms/MainWindow.xaml.cs
@@ -852,9 +852,7 @@ private void AutoProfilesTimer_Elapsed(object sender, System.Timers.ElapsedEvent
         {
             autoProfilesTimer.Stop();
             //Console.WriteLine("Event triggered");
-            App.rootHub.UpdateGameBarProfileState();
             autoprofileChecker.Process();
-            App.rootHub.UpdateGameBarProfileState();
 
             if (autoprofileChecker.Running)
             {

From 3a25a34416353af88c1978a83c3016627e720e6b Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 12:01:49 -0500
Subject: [PATCH 33/47] Fix auto profile process lookup compile error

---
 DS4Windows/AutoProfileChecker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DS4Windows/AutoProfileChecker.cs b/DS4Windows/AutoProfileChecker.cs
index d90f486..4d6454f 100644
--- a/DS4Windows/AutoProfileChecker.cs
+++ b/DS4Windows/AutoProfileChecker.cs
@@ -365,7 +365,7 @@ private static string GetProcessExecutablePath(uint processId)
 
             try
             {
-                using (Process process = Process.GetProcessById((int)processId))
+                using (System.Diagnostics.Process process = System.Diagnostics.Process.GetProcessById((int)processId))
                 {
                     return process.ProcessName + ".exe";
                 }

From c763967b6bff64c7c7fa11694bebd9aff1383f32 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 12:10:35 -0500
Subject: [PATCH 34/47] Fix tray controller list startup race

---
 .../DS4Forms/ViewModels/TrayIconViewModel.cs  | 121 ++++++++++++++----
 1 file changed, 94 insertions(+), 27 deletions(-)

diff --git a/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs b/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
index 3857802..8db2034 100644
--- a/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
@@ -143,28 +143,48 @@ private void Service_RunningChanged(object sender, EventArgs e)
 
         private void ClearControllerList(object sender, EventArgs e)
         {
-            _colLocker.EnterWriteLock();
-            controllerList.Clear();
-            _colLocker.ExitWriteLock();
+            using (WriteLocker locker = new WriteLocker(_colLocker))
+            {
+                foreach (ControllerHolder holder in controllerList)
+                {
+                    RemoveDeviceEvents(holder.Device);
+                }
+
+                controllerList.Clear();
+            }
         }
 
         private void UnhookEvents(object sender, EventArgs e)
         {
-            _colLocker.EnterReadLock();
-            foreach (ControllerHolder holder in controllerList)
+            using (ReadLocker locker = new ReadLocker(_colLocker))
             {
-                DS4Device currentDev = holder.Device;
-                RemoveDeviceEvents(currentDev);
+                foreach (ControllerHolder holder in controllerList)
+                {
+                    RemoveDeviceEvents(holder.Device);
+                }
             }
-            _colLocker.ExitReadLock();
         }
 
         private void Service_HotplugController(ControlService sender, DS4Device device, int index)
         {
-            SetupDeviceEvents(device);
-            _colLocker.EnterWriteLock();
-            controllerList.Add(new ControllerHolder(device, index));
-            _colLocker.ExitWriteLock();
+            try
+            {
+                if (device == null)
+                {
+                    return;
+                }
+
+                using (WriteLocker locker = new WriteLocker(_colLocker))
+                {
+                    controllerList.RemoveAll(holder => holder.Device == device || holder.Index == index);
+                    controllerList.Add(new ControllerHolder(device, index));
+                    SetupDeviceEvents(device);
+                }
+            }
+            catch (Exception ex)
+            {
+                DS4Windows.AppLogger.LogToGui($"Tray hotplug update failed: {ex.Message}", true);
+            }
         }
 
         private void ProfileListCol_CollectionChanged(object sender,
@@ -175,7 +195,14 @@ private void ProfileListCol_CollectionChanged(object sender,
 
         private void BuildControllerList(object sender, EventArgs e)
         {
-            PopulateControllerList();
+            try
+            {
+                PopulateControllerList();
+            }
+            catch (Exception ex)
+            {
+                DS4Windows.AppLogger.LogToGui($"Tray controller list update failed: {ex.Message}", true);
+            }
         }
 
         public void PopulateContextMenu()
@@ -271,7 +298,12 @@ private void ProfileItem_Click(object sender, System.Windows.RoutedEventArgs e)
         {
             MenuItem item = sender as MenuItem;
             int idx = Convert.ToInt32(item.Tag);
-            ControllerHolder holder = controllerList[idx];
+            ControllerHolder holder = GetControllerHolderByListIndex(idx);
+            if (holder == null)
+            {
+                return;
+            }
+
             // Un-escape underscores is MenuItem header. Header holds the profile name
             string tempProfileName = Regex.Replace(item.Header.ToString(),
                 "_{2}", "_");
@@ -283,7 +315,7 @@ private void DisconnectMenuItem_Click(object sender,
         {
             MenuItem item = sender as MenuItem;
             int idx = Convert.ToInt32(item.Tag);
-            ControllerHolder holder = controllerList[idx];
+            ControllerHolder holder = GetControllerHolderByListIndex(idx);
             DS4Device tempDev = holder?.Device;
             if (tempDev != null && tempDev.Synced && !tempDev.Charging)
             {
@@ -303,15 +335,31 @@ private void DisconnectMenuItem_Click(object sender,
 
         private void PopulateControllerList()
         {
-            //IEnumerable<DS4Device> devices = DS4Devices.getDS4Controllers();
-            int idx = 0;
-            _colLocker.EnterWriteLock();
-            foreach (DS4Device currentDev in controlService.slotManager.ControllerColl)
+            List<ControllerHolder> holders = new List<ControllerHolder>();
+            using (ReadLocker slotLocker = new ReadLocker(controlService.slotManager.CollectionLocker))
             {
-                controllerList.Add(new ControllerHolder(currentDev, idx));
-                idx++;
+                int idx = 0;
+                foreach (DS4Device currentDev in controlService.slotManager.ControllerColl)
+                {
+                    holders.Add(new ControllerHolder(currentDev, idx));
+                    idx++;
+                }
+            }
+
+            using (WriteLocker locker = new WriteLocker(_colLocker))
+            {
+                foreach (ControllerHolder holder in controllerList)
+                {
+                    RemoveDeviceEvents(holder.Device);
+                }
+
+                controllerList.Clear();
+                foreach (ControllerHolder holder in holders)
+                {
+                    controllerList.Add(holder);
+                    SetupDeviceEvents(holder.Device);
+                }
             }
-            _colLocker.ExitWriteLock();
         }
 
         private void StartPopulateText(object sender, EventArgs e)
@@ -332,17 +380,23 @@ private void SetupEvents()
         {
             //IEnumerable<DS4Device> devices = DS4Devices.getDS4Controllers();
             //foreach (DS4Device currentDev in devices)
-            _colLocker.EnterReadLock();
-            foreach (ControllerHolder holder in controllerList)
+            using (ReadLocker locker = new ReadLocker(_colLocker))
             {
-                DS4Device currentDev = holder.Device;
-                SetupDeviceEvents(currentDev);
+                foreach (ControllerHolder holder in controllerList)
+                {
+                    SetupDeviceEvents(holder.Device);
+                }
             }
-            _colLocker.ExitReadLock();
         }
 
         private void SetupDeviceEvents(DS4Device device)
         {
+            if (device == null)
+            {
+                return;
+            }
+
+            RemoveDeviceEvents(device);
             device.BatteryChanged += UpdateForBattery;
             device.ChargingChanged += UpdateForBattery;
             device.Removal += CurrentDev_Removal;
@@ -350,6 +404,11 @@ private void SetupDeviceEvents(DS4Device device)
 
         private void RemoveDeviceEvents(DS4Device device)
         {
+            if (device == null)
+            {
+                return;
+            }
+
             device.BatteryChanged -= UpdateForBattery;
             device.ChargingChanged -= UpdateForBattery;
             device.Removal -= CurrentDev_Removal;
@@ -384,6 +443,14 @@ private void CurrentDev_Removal(object sender, EventArgs e)
             PopulateToolText();
         }
 
+        private ControllerHolder GetControllerHolderByListIndex(int idx)
+        {
+            using (ReadLocker locker = new ReadLocker(_colLocker))
+            {
+                return idx >= 0 && idx < controllerList.Count ? controllerList[idx] : null;
+            }
+        }
+
         private void HookEvents(object sender, EventArgs e)
         {
             SetupEvents();

From b57ba5bf9c4f18cc13ef271b3427ae715f9a0f6b Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 12:22:38 -0500
Subject: [PATCH 35/47] Restore nonblocking Game Bar API detection

---
 DS4Windows/DS4Control/GameBarIntegration.cs | 80 +++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/DS4Windows/DS4Control/GameBarIntegration.cs b/DS4Windows/DS4Control/GameBarIntegration.cs
index f9c67f9..eaaf078 100644
--- a/DS4Windows/DS4Control/GameBarIntegration.cs
+++ b/DS4Windows/DS4Control/GameBarIntegration.cs
@@ -40,9 +40,18 @@ public class GameBarIntegration
         private const int MaxAutomationVisitCount = 500;
         private const int MaxAutomationDepth = 5;
         private const int MaxDiagnosticTextLength = 160;
+        private const int LiveGameBarApiPollMs = 500;
+        private const int LiveGameBarApiCacheMs = 1500;
+        private const int LiveGameBarApiHangMs = 1500;
         private const int LiveAutomationPollMs = 1000;
         private const int LiveAutomationCacheMs = 3000;
         private static bool? gameBarApiPresent;
+        private static readonly object gameBarApiPollLock = new object();
+        private static bool gameBarApiPollRunning;
+        private static bool gameBarApiPollCachedVisible;
+        private static DateTime gameBarApiPollLastStartedUtc = DateTime.MinValue;
+        private static DateTime gameBarApiPollLastCompletedUtc = DateTime.MinValue;
+        private static int gameBarApiPollGeneration;
         private static readonly object automationPollLock = new object();
         private static bool automationPollRunning;
         private static bool automationPollCachedVisible;
@@ -118,6 +127,11 @@ public bool IsGameBarVisible()
                 return true;
             }
 
+            if (IsGameBarVisibleByCachedGameBarApi())
+            {
+                return true;
+            }
+
             return IsGameBarVisibleByCachedAutomation();
         }
 
@@ -151,6 +165,71 @@ private static bool IsGameBarVisibleByWindowEnumeration()
             return visible;
         }
 
+        private static bool IsGameBarVisibleByCachedGameBarApi()
+        {
+            if (gameBarApiPresent.HasValue && !gameBarApiPresent.Value)
+            {
+                return false;
+            }
+
+            DateTime now = DateTime.UtcNow;
+            lock (gameBarApiPollLock)
+            {
+                bool cachedResultIsFresh = gameBarApiPollCachedVisible &&
+                    now - gameBarApiPollLastCompletedUtc < TimeSpan.FromMilliseconds(LiveGameBarApiCacheMs);
+
+                bool pollIsStale = gameBarApiPollRunning &&
+                    now - gameBarApiPollLastStartedUtc > TimeSpan.FromMilliseconds(LiveGameBarApiHangMs);
+
+                if ((!gameBarApiPollRunning || pollIsStale) &&
+                    now - gameBarApiPollLastStartedUtc >= TimeSpan.FromMilliseconds(LiveGameBarApiPollMs))
+                {
+                    gameBarApiPollRunning = true;
+                    gameBarApiPollLastStartedUtc = now;
+                    int pollGeneration = ++gameBarApiPollGeneration;
+
+                    Thread worker = new Thread(() =>
+                    {
+                        bool visible = false;
+                        try
+                        {
+                            if (TryGetGameBarApiStateCore(out bool apiVisible, out bool apiInputRedirected, out _))
+                            {
+                                visible = apiVisible || apiInputRedirected;
+                            }
+                        }
+                        catch
+                        {
+                            visible = false;
+                        }
+                        finally
+                        {
+                            lock (gameBarApiPollLock)
+                            {
+                                if (pollGeneration == gameBarApiPollGeneration || visible)
+                                {
+                                    gameBarApiPollCachedVisible = visible;
+                                    gameBarApiPollLastCompletedUtc = DateTime.UtcNow;
+                                }
+
+                                if (pollGeneration == gameBarApiPollGeneration)
+                                {
+                                    gameBarApiPollRunning = false;
+                                }
+                            }
+                        }
+                    });
+
+                    worker.IsBackground = true;
+                    worker.Name = "DS4Windows Game Bar API Poll";
+                    worker.SetApartmentState(ApartmentState.STA);
+                    worker.Start();
+                }
+
+                return cachedResultIsFresh;
+            }
+        }
+
         private static bool IsGameBarVisibleByCachedAutomation()
         {
             DateTime now = DateTime.UtcNow;
@@ -189,6 +268,7 @@ private static bool IsGameBarVisibleByCachedAutomation()
 
                     worker.IsBackground = true;
                     worker.Name = "DS4Windows Game Bar UIA Poll";
+                    worker.SetApartmentState(ApartmentState.STA);
                     worker.Start();
                 }
 

From 5985a1bbaa712448814e5cc25ebf6579dabef1ac Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 12:33:48 -0500
Subject: [PATCH 36/47] Use MTA Game Bar API polling

---
 DS4Windows/DS4Control/GameBarIntegration.cs | 26 ++++++++++-----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/DS4Windows/DS4Control/GameBarIntegration.cs b/DS4Windows/DS4Control/GameBarIntegration.cs
index eaaf078..f956881 100644
--- a/DS4Windows/DS4Control/GameBarIntegration.cs
+++ b/DS4Windows/DS4Control/GameBarIntegration.cs
@@ -45,7 +45,6 @@ public class GameBarIntegration
         private const int LiveGameBarApiHangMs = 1500;
         private const int LiveAutomationPollMs = 1000;
         private const int LiveAutomationCacheMs = 3000;
-        private static bool? gameBarApiPresent;
         private static readonly object gameBarApiPollLock = new object();
         private static bool gameBarApiPollRunning;
         private static bool gameBarApiPollCachedVisible;
@@ -167,11 +166,6 @@ private static bool IsGameBarVisibleByWindowEnumeration()
 
         private static bool IsGameBarVisibleByCachedGameBarApi()
         {
-            if (gameBarApiPresent.HasValue && !gameBarApiPresent.Value)
-            {
-                return false;
-            }
-
             DateTime now = DateTime.UtcNow;
             lock (gameBarApiPollLock)
             {
@@ -222,7 +216,6 @@ private static bool IsGameBarVisibleByCachedGameBarApi()
 
                     worker.IsBackground = true;
                     worker.Name = "DS4Windows Game Bar API Poll";
-                    worker.SetApartmentState(ApartmentState.STA);
                     worker.Start();
                 }
 
@@ -324,13 +317,6 @@ private static bool TryGetGameBarApiStateCore(out bool visible, out bool inputRe
 
             try
             {
-                gameBarApiPresent ??= ApiInformation.IsTypePresent("Windows.Gaming.UI.GameBar");
-                if (!gameBarApiPresent.Value)
-                {
-                    status = "not present";
-                    return false;
-                }
-
                 visible = GameBar.Visible;
                 inputRedirected = GameBar.IsInputRedirected;
                 status = "ok";
@@ -338,6 +324,18 @@ private static bool TryGetGameBarApiStateCore(out bool visible, out bool inputRe
             }
             catch (Exception ex)
             {
+                try
+                {
+                    if (!ApiInformation.IsTypePresent("Windows.Gaming.UI.GameBar"))
+                    {
+                        status = "not present";
+                        return false;
+                    }
+                }
+                catch
+                {
+                }
+
                 status = ex.GetType().Name + ": " + ex.Message;
                 return false;
             }

From 8d71bc765b057ce563daa0cad5ca874c39612ea0 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 12:50:34 -0500
Subject: [PATCH 37/47] Add verbose Game Bar detection diagnostics

---
 DS4Windows/DS4Control/ControlService.cs     |  79 +++++++-
 DS4Windows/DS4Control/GameBarIntegration.cs | 197 +++++++++++++++-----
 DS4Windows/DS4Forms/MainWindow.xaml         |   4 +-
 3 files changed, 228 insertions(+), 52 deletions(-)

diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index fb12a7a..e84c305 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -2975,6 +2975,9 @@ protected void On_DS4Removal(object sender, EventArgs e)
         private DateTime gameBarLastVisibleUtc = DateTime.MinValue;
         private DateTime gameBarInvisibleSinceUtc = DateTime.MinValue;
         private DateTime gameBarLastVisibilityCheckUtc = DateTime.MinValue;
+        private bool gameBarVerboseDetectionLogInitialized = false;
+        private bool gameBarVerboseLastVisible = false;
+        private DateTime gameBarVerboseLastDetectionLogUtc = DateTime.MinValue;
 
         public bool IsGameBarProfilePriorityActive(int ind)
         {
@@ -3080,6 +3083,7 @@ private void RequestGameBarProfilePriority(int ind, string profileName, DateTime
             gameBarRequestedProfileName[ind] = profileName;
             gameBarProfileRequestedUtc[ind] = now;
             gameBarProfilePending[ind] = true;
+            StartupDiag($"GameBar profile requested controller={ind + 1} target='{profileName}' previousTemp={gameBarPreviousUseTempProfile[ind]} previousTempProfile='{gameBarPreviousTempProfileName[ind]}' previousProfile='{gameBarPreviousProfileName[ind]}'");
         }
 
         private void CheckGameBarHomeButton(int ind, DS4State cState, DS4State tempControlState, DS4State pState)
@@ -3106,7 +3110,8 @@ private void CheckGameBarHomeButton(int ind, DS4State cState, DS4State tempContr
             {
                 cState.PS = false;
                 tempControlState.PS = false;
-                gameBarIntegration.OpenGameBar();
+                string openResult = gameBarIntegration.OpenGameBar();
+                StartupDiag($"GameBar home button controller={ind + 1} existingPriority active={gameBarProfileActive[ind]} pending={gameBarProfilePending[ind]} {openResult}");
                 gameBarHomeButtonIgnoreUntilUtc[ind] = now + TimeSpan.FromSeconds(1);
                 return;
             }
@@ -3120,7 +3125,8 @@ private void CheckGameBarHomeButton(int ind, DS4State cState, DS4State tempContr
             tempControlState.PS = false;
             gameBarHomeButtonIgnoreUntilUtc[ind] = now + TimeSpan.FromSeconds(1);
             RequestGameBarProfilePriority(ind, profileName, now);
-            gameBarIntegration.OpenGameBar();
+            string result = gameBarIntegration.OpenGameBar();
+            StartupDiag($"GameBar home button controller={ind + 1} requestedProfile='{profileName}' {result}");
         }
 
         public void UpdateGameBarProfileState()
@@ -3153,6 +3159,7 @@ public void UpdateGameBarProfileState()
 
                 gameBarLastVisibilityCheckUtc = now;
                 bool gameBarVisible = gameBarIntegration.IsGameBarVisible();
+                LogGameBarDetectionIfVerbose(now, gameBarVisible, anyConfigured, anyActiveOrPending);
                 if (gameBarVisible)
                 {
                     gameBarLastVisibleUtc = now;
@@ -3206,6 +3213,65 @@ public void UpdateGameBarProfileState()
             }
         }
 
+        private void LogGameBarDetectionIfVerbose(DateTime now, bool gameBarVisible, bool anyConfigured, bool anyActiveOrPending)
+        {
+            if (!Global.VerboseStartupLogging)
+            {
+                return;
+            }
+
+            bool shouldLog = !gameBarVerboseDetectionLogInitialized ||
+                gameBarVisible != gameBarVerboseLastVisible ||
+                now - gameBarVerboseLastDetectionLogUtc > TimeSpan.FromSeconds(3);
+
+            if (!shouldLog)
+            {
+                return;
+            }
+
+            gameBarVerboseDetectionLogInitialized = true;
+            gameBarVerboseLastVisible = gameBarVisible;
+            gameBarVerboseLastDetectionLogUtc = now;
+            StartupDiag($"GameBar detection visible={gameBarVisible} anyConfigured={anyConfigured} anyActiveOrPending={anyActiveOrPending} {gameBarIntegration.LastDetectionSummary} controllers={BuildGameBarPriorityStateSummary()}");
+        }
+
+        private string BuildGameBarPriorityStateSummary()
+        {
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < MAX_DS4_CONTROLLER_COUNT; i++)
+            {
+                if (DS4Controllers[i] == null &&
+                    !gameBarProfileActive[i] &&
+                    !gameBarProfilePending[i])
+                {
+                    continue;
+                }
+
+                if (builder.Length > 0)
+                {
+                    builder.Append(" ");
+                }
+
+                builder.Append("C");
+                builder.Append(i + 1);
+                builder.Append("[connected=");
+                builder.Append(DS4Controllers[i] != null);
+                builder.Append(",enabled=");
+                builder.Append(Global.GameBarHomeButtonSupport[i]);
+                builder.Append(",target='");
+                builder.Append(Global.GameBarProfileName[i]);
+                builder.Append("',active=");
+                builder.Append(gameBarProfileActive[i]);
+                builder.Append(",pending=");
+                builder.Append(gameBarProfilePending[i]);
+                builder.Append(",requested='");
+                builder.Append(gameBarRequestedProfileName[i]);
+                builder.Append("']");
+            }
+
+            return builder.Length == 0 ? "none" : builder.ToString();
+        }
+
         private void RequestVisibleGameBarProfiles(DateTime now)
         {
             for (int i = 0; i < MAX_DS4_CONTROLLER_COUNT; i++)
@@ -3242,6 +3308,7 @@ private void ActivatePendingGameBarProfiles(DateTime now)
 
                 if (!actionRan)
                 {
+                    StartupDiag($"GameBar profile activation skipped controller={i + 1} target='{profileName}' reason=reporting-action-not-run");
                     continue;
                 }
 
@@ -3249,6 +3316,11 @@ private void ActivatePendingGameBarProfiles(DateTime now)
                 {
                     gameBarProfileActive[i] = true;
                     gameBarProfileActivatedUtc[i] = now;
+                    StartupDiag($"GameBar profile activated controller={i + 1} target='{profileName}'");
+                }
+                else
+                {
+                    StartupDiag($"GameBar profile activation failed controller={i + 1} target='{profileName}'");
                 }
 
                 ClearPendingGameBarProfile(i);
@@ -3281,11 +3353,13 @@ private bool RestorePreviousGameBarProfile(int ind)
                     () => restored = Global.LoadTempProfile(ind, gameBarPreviousTempProfileName[ind], false, this));
                 if (!actionRan)
                 {
+                    StartupDiag($"GameBar profile restore skipped controller={ind + 1} targetTemp='{gameBarPreviousTempProfileName[ind]}' reason=reporting-action-not-run");
                     return false;
                 }
 
                 if (restored)
                 {
+                    StartupDiag($"GameBar profile restored controller={ind + 1} tempProfile='{gameBarPreviousTempProfileName[ind]}'");
                     return true;
                 }
             }
@@ -3299,6 +3373,7 @@ private bool RestorePreviousGameBarProfile(int ind)
 
             actionRan = RunProfileActionWithReportingPaused(ind,
                 () => restored = Global.LoadProfile(ind, false, this));
+            StartupDiag($"GameBar profile restore controller={ind + 1} profile='{previousProfileName}' actionRan={actionRan} restored={restored}");
             return actionRan && restored;
         }
 
diff --git a/DS4Windows/DS4Control/GameBarIntegration.cs b/DS4Windows/DS4Control/GameBarIntegration.cs
index f956881..588020f 100644
--- a/DS4Windows/DS4Control/GameBarIntegration.cs
+++ b/DS4Windows/DS4Control/GameBarIntegration.cs
@@ -45,12 +45,19 @@ public class GameBarIntegration
         private const int LiveGameBarApiHangMs = 1500;
         private const int LiveAutomationPollMs = 1000;
         private const int LiveAutomationCacheMs = 3000;
+        private static readonly object detectionStatusLock = new object();
         private static readonly object gameBarApiPollLock = new object();
         private static bool gameBarApiPollRunning;
         private static bool gameBarApiPollCachedVisible;
         private static DateTime gameBarApiPollLastStartedUtc = DateTime.MinValue;
         private static DateTime gameBarApiPollLastCompletedUtc = DateTime.MinValue;
         private static int gameBarApiPollGeneration;
+        private static bool gameBarApiPollLastSupported;
+        private static bool gameBarApiPollLastVisible;
+        private static bool gameBarApiPollLastInputRedirected;
+        private static long gameBarApiPollLastElapsedMs;
+        private static string gameBarApiPollLastStatus = "not started";
+        private static string lastDetectionSummary = "not checked";
         private static readonly object automationPollLock = new object();
         private static bool automationPollRunning;
         private static bool automationPollCachedVisible;
@@ -119,24 +126,45 @@ public string OpenGameBar()
             return "keybd_event Win+G sent";
         }
 
-        public bool IsGameBarVisible()
+        public string LastDetectionSummary
         {
-            if (IsGameBarVisibleByWindowEnumeration())
+            get
             {
-                return true;
+                lock (detectionStatusLock)
+                {
+                    return lastDetectionSummary;
+                }
             }
+        }
 
-            if (IsGameBarVisibleByCachedGameBarApi())
+        public bool IsGameBarVisible()
+        {
+            bool apiVisible = IsGameBarVisibleByCachedGameBarApi(out string apiSummary);
+            bool windowVisible = IsGameBarVisibleByWindowEnumeration(out string windowSummary);
+            bool visible = apiVisible || windowVisible;
+            string source = apiVisible ? "api" : windowVisible ? "window" : "none";
+            UpdateLastDetectionSummary(visible, source,
+                $"api={apiSummary}; window={windowSummary}; uia=diagnostic-only");
+            return visible;
+        }
+
+        private static void UpdateLastDetectionSummary(bool visible, string source, string details)
+        {
+            lock (detectionStatusLock)
             {
-                return true;
+                lastDetectionSummary = $"source={source} visible={visible} {details}";
             }
-
-            return IsGameBarVisibleByCachedAutomation();
         }
 
         private static bool IsGameBarVisibleByWindowEnumeration()
+        {
+            return IsGameBarVisibleByWindowEnumeration(out _);
+        }
+
+        private static bool IsGameBarVisibleByWindowEnumeration(out string summary)
         {
             bool visible = false;
+            string matchSummary = string.Empty;
 
             try
             {
@@ -147,24 +175,34 @@ private static bool IsGameBarVisibleByWindowEnumeration()
                         return true;
                     }
 
-                    if (LooksLikeGameBarWindow(hWnd) || HasGameBarChildWindow(hWnd))
+                    if (LooksLikeGameBarWindow(hWnd, out string windowReason) ||
+                        HasGameBarChildWindow(hWnd, out windowReason))
                     {
                         visible = true;
+                        matchSummary = windowReason;
                         return false;
                     }
 
                     return true;
                 }, IntPtr.Zero);
             }
-            catch
+            catch (Exception ex)
             {
-                visible = false;
+                summary = "error " + ex.GetType().Name + ": " + TruncateDiagnosticText(ex.Message);
+                return false;
             }
 
-            return visible;
+            if (visible)
+            {
+                summary = matchSummary;
+                return true;
+            }
+
+            summary = "no strict visible HWND match";
+            return false;
         }
 
-        private static bool IsGameBarVisibleByCachedGameBarApi()
+        private static bool IsGameBarVisibleByCachedGameBarApi(out string summary)
         {
             DateTime now = DateTime.UtcNow;
             lock (gameBarApiPollLock)
@@ -185,21 +223,32 @@ private static bool IsGameBarVisibleByCachedGameBarApi()
                     Thread worker = new Thread(() =>
                     {
                         bool visible = false;
+                        bool supported = false;
+                        bool apiVisible = false;
+                        bool apiInputRedirected = false;
+                        string apiStatus = "not started";
+                        Stopwatch stopwatch = Stopwatch.StartNew();
                         try
                         {
-                            if (TryGetGameBarApiStateCore(out bool apiVisible, out bool apiInputRedirected, out _))
-                            {
-                                visible = apiVisible || apiInputRedirected;
-                            }
+                            supported = TryGetGameBarApiStateCore(out apiVisible, out apiInputRedirected, out apiStatus);
+                            visible = supported && (apiVisible || apiInputRedirected);
                         }
-                        catch
+                        catch (Exception ex)
                         {
+                            apiStatus = ex.GetType().Name + ": " + ex.Message;
                             visible = false;
                         }
                         finally
                         {
+                            stopwatch.Stop();
                             lock (gameBarApiPollLock)
                             {
+                                gameBarApiPollLastSupported = supported;
+                                gameBarApiPollLastVisible = apiVisible;
+                                gameBarApiPollLastInputRedirected = apiInputRedirected;
+                                gameBarApiPollLastElapsedMs = stopwatch.ElapsedMilliseconds;
+                                gameBarApiPollLastStatus = apiStatus;
+
                                 if (pollGeneration == gameBarApiPollGeneration || visible)
                                 {
                                     gameBarApiPollCachedVisible = visible;
@@ -219,10 +268,27 @@ private static bool IsGameBarVisibleByCachedGameBarApi()
                     worker.Start();
                 }
 
+                summary = BuildCachedGameBarApiSummary(now, cachedResultIsFresh, pollIsStale);
                 return cachedResultIsFresh;
             }
         }
 
+        private static string BuildCachedGameBarApiSummary(DateTime now, bool cachedResultIsFresh, bool pollIsStale)
+        {
+            string completedAge = gameBarApiPollLastCompletedUtc == DateTime.MinValue ?
+                "never" :
+                ((int)(now - gameBarApiPollLastCompletedUtc).TotalMilliseconds).ToString() + "ms";
+            string startedAge = gameBarApiPollLastStartedUtc == DateTime.MinValue ?
+                "never" :
+                ((int)(now - gameBarApiPollLastStartedUtc).TotalMilliseconds).ToString() + "ms";
+
+            return $"cachedFresh={cachedResultIsFresh} cachedVisible={gameBarApiPollCachedVisible} " +
+                $"running={gameBarApiPollRunning} stale={pollIsStale} startedAge={startedAge} completedAge={completedAge} " +
+                $"lastSupported={gameBarApiPollLastSupported} lastVisible={gameBarApiPollLastVisible} " +
+                $"lastInputRedirected={gameBarApiPollLastInputRedirected} lastElapsedMs={gameBarApiPollLastElapsedMs} " +
+                $"lastStatus='{TruncateDiagnosticText(gameBarApiPollLastStatus)}'";
+        }
+
         private static bool IsGameBarVisibleByCachedAutomation()
         {
             DateTime now = DateTime.UtcNow;
@@ -317,6 +383,12 @@ private static bool TryGetGameBarApiStateCore(out bool visible, out bool inputRe
 
             try
             {
+                if (!ApiInformation.IsTypePresent("Windows.Gaming.UI.GameBar"))
+                {
+                    status = "not present";
+                    return false;
+                }
+
                 visible = GameBar.Visible;
                 inputRedirected = GameBar.IsInputRedirected;
                 status = "ok";
@@ -324,18 +396,6 @@ private static bool TryGetGameBarApiStateCore(out bool visible, out bool inputRe
             }
             catch (Exception ex)
             {
-                try
-                {
-                    if (!ApiInformation.IsTypePresent("Windows.Gaming.UI.GameBar"))
-                    {
-                        status = "not present";
-                        return false;
-                    }
-                }
-                catch
-                {
-                }
-
                 status = ex.GetType().Name + ": " + ex.Message;
                 return false;
             }
@@ -576,17 +636,23 @@ private static bool LooksLikeGameBarAutomationElement(AutomationElement element)
                 return false;
             }
 
-            bool processLooksRight = IsGameBarRelatedProcessName(processName);
-
             bool textLooksRight =
                 name.IndexOf("Xbox Game Bar", StringComparison.OrdinalIgnoreCase) >= 0 ||
                 name.IndexOf("Game Bar", StringComparison.OrdinalIgnoreCase) >= 0 ||
                 automationId.IndexOf("GameBar", StringComparison.OrdinalIgnoreCase) >= 0 ||
-                automationId.IndexOf("Xbox", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                automationId.IndexOf("XboxGameBar", StringComparison.OrdinalIgnoreCase) >= 0 ||
                 className.IndexOf("GameBar", StringComparison.OrdinalIgnoreCase) >= 0 ||
-                className.IndexOf("Xbox", StringComparison.OrdinalIgnoreCase) >= 0;
+                className.IndexOf("XboxGameBar", StringComparison.OrdinalIgnoreCase) >= 0;
 
-            return processLooksRight || (textLooksRight && !IsKnownNoisyProcessName(processName));
+            if (textLooksRight)
+            {
+                return true;
+            }
+
+            return IsStrictGameBarProcessName(processName) &&
+                (className.IndexOf("Xaml", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                 className.IndexOf("CoreWindow", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                 automationId.IndexOf("GameBar", StringComparison.OrdinalIgnoreCase) >= 0);
         }
 
         private static bool IsAutomationDiagnosticCandidate(string processName, string name, string className, string automationId)
@@ -648,8 +714,14 @@ private static bool SafeGetResponding(Process process)
         }
 
         private static bool HasGameBarChildWindow(IntPtr parentWindow)
+        {
+            return HasGameBarChildWindow(parentWindow, out _);
+        }
+
+        private static bool HasGameBarChildWindow(IntPtr parentWindow, out string summary)
         {
             bool found = false;
+            string matchSummary = string.Empty;
 
             EnumChildWindows(parentWindow, (hWnd, lParam) =>
             {
@@ -658,42 +730,71 @@ private static bool HasGameBarChildWindow(IntPtr parentWindow)
                     return true;
                 }
 
-                if (LooksLikeGameBarWindow(hWnd))
+                if (LooksLikeGameBarWindow(hWnd, out string windowReason))
                 {
                     found = true;
+                    matchSummary = "child " + windowReason;
                     return false;
                 }
 
                 return true;
             }, IntPtr.Zero);
 
+            summary = matchSummary;
             return found;
         }
 
         private static bool LooksLikeGameBarWindow(IntPtr hWnd)
+        {
+            return LooksLikeGameBarWindow(hWnd, out _);
+        }
+
+        private static bool LooksLikeGameBarWindow(IntPtr hWnd, out string summary)
         {
             string title = GetWindowTitle(hWnd);
             string className = GetWindowClassName(hWnd);
             string processName = GetProcessName(hWnd);
+            summary = $"hwnd=0x{hWnd.ToInt64():X} proc='{TruncateDiagnosticText(processName)}' class='{TruncateDiagnosticText(className)}' title='{TruncateDiagnosticText(title)}'";
 
-            bool processLooksRight =
-                processName.Equals("GameBar", StringComparison.OrdinalIgnoreCase) ||
-                processName.Equals("XboxGameBar", StringComparison.OrdinalIgnoreCase) ||
-                processName.Equals("GameBarFTServer", StringComparison.OrdinalIgnoreCase) ||
-                processName.Equals("GameBarWidgets", StringComparison.OrdinalIgnoreCase) ||
-                processName.Equals("GameBarElevatedFT_Alias", StringComparison.OrdinalIgnoreCase);
+            bool trustedProcess = IsStrictGameBarProcessName(processName) ||
+                processName.Equals("ApplicationFrameHost", StringComparison.OrdinalIgnoreCase) ||
+                processName.Equals("ShellExperienceHost", StringComparison.OrdinalIgnoreCase);
+
+            if (!trustedProcess)
+            {
+                return false;
+            }
 
-            bool titleLooksRight =
+            bool titleExplicitlyGameBar =
                 title.IndexOf("Xbox Game Bar", StringComparison.OrdinalIgnoreCase) >= 0 ||
-                title.IndexOf("Game Bar", StringComparison.OrdinalIgnoreCase) >= 0;
+                title.Equals("Game Bar", StringComparison.OrdinalIgnoreCase);
 
-            bool classLooksRight =
+            bool classExplicitlyGameBar =
                 className.IndexOf("GameBar", StringComparison.OrdinalIgnoreCase) >= 0 ||
-                className.IndexOf("Xbox", StringComparison.OrdinalIgnoreCase) >= 0 ||
-                className.IndexOf("Xaml", StringComparison.OrdinalIgnoreCase) >= 0;
+                className.IndexOf("XboxGameBar", StringComparison.OrdinalIgnoreCase) >= 0;
+
+            if (titleExplicitlyGameBar || classExplicitlyGameBar)
+            {
+                return true;
+            }
+
+            bool strictProcessGenericOverlayWindow =
+                IsStrictGameBarProcessName(processName) &&
+                (className.IndexOf("Xaml", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                 className.IndexOf("CoreWindow", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                 className.IndexOf("ApplicationFrame", StringComparison.OrdinalIgnoreCase) >= 0);
 
-            return (processLooksRight && (titleLooksRight || classLooksRight)) ||
-                titleLooksRight;
+            return strictProcessGenericOverlayWindow;
+        }
+
+        private static bool IsStrictGameBarProcessName(string processName)
+        {
+            return processName.Equals("GameBar", StringComparison.OrdinalIgnoreCase) ||
+                processName.Equals("XboxGameBar", StringComparison.OrdinalIgnoreCase) ||
+                processName.Equals("GameBarFTServer", StringComparison.OrdinalIgnoreCase) ||
+                processName.Equals("GameBarWidgets", StringComparison.OrdinalIgnoreCase) ||
+                processName.Equals("XboxGameBarWidgets", StringComparison.OrdinalIgnoreCase) ||
+                processName.Equals("GameBarElevatedFT_Alias", StringComparison.OrdinalIgnoreCase);
         }
 
         private static bool IsInspectableWindow(IntPtr hWnd)
diff --git a/DS4Windows/DS4Forms/MainWindow.xaml b/DS4Windows/DS4Forms/MainWindow.xaml
index e9ddebb..36ff418 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml
+++ b/DS4Windows/DS4Forms/MainWindow.xaml
@@ -311,9 +311,9 @@
                         <CheckBox Content="{lex:Loc QuickCharge}" Margin="{StaticResource spaceMargin}"
                               IsChecked="{Binding QuickCharge}"
                               ToolTip="{lex:Loc Resources:QuickCharge}" />
-                        <CheckBox Content="Enable startup diagnostics" Margin="{StaticResource spaceMargin}"
+                        <CheckBox Content="Verbose logging" Margin="{StaticResource spaceMargin}"
                               IsChecked="{Binding VerboseStartupLogging}"
-                              ToolTip="Writes detailed startup diagnostic markers to the log. Disable after testing." />
+                              ToolTip="Writes detailed diagnostic markers to the log. Disable after testing." />
                         <StackPanel Orientation="Horizontal" Margin="{StaticResource spaceMargin}">
                             <Label Content="{lex:Loc IconChoice}" ContentStringFormat="{}{0}:"/>
                             <ComboBox x:Name="useIconChoiceCom" SelectedIndex="{Binding IconChoiceIndex,FallbackValue='0'}" Margin="10,0,0,0">

From f9487ca0ca725662f5a35b9c83af4cc2aa6d5b78 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 13:04:21 -0500
Subject: [PATCH 38/47] Isolate Game Bar visibility probe

---
 DS4Windows/App.xaml.cs                      |   7 +
 DS4Windows/DS4Control/GameBarIntegration.cs | 206 ++++++++++++++++++--
 2 files changed, 192 insertions(+), 21 deletions(-)

diff --git a/DS4Windows/App.xaml.cs b/DS4Windows/App.xaml.cs
index fc51b69..1535c6c 100644
--- a/DS4Windows/App.xaml.cs
+++ b/DS4Windows/App.xaml.cs
@@ -91,6 +91,13 @@ private void Application_Startup(object sender, StartupEventArgs e)
             runShutdown = true;
             skipSave = true;
 
+            if (DS4Windows.GameBarIntegration.TryRunProbeCommand(e.Args))
+            {
+                runShutdown = false;
+                Current.Shutdown();
+                return;
+            }
+
             ArgumentParser parser = new ArgumentParser();
             parser.Parse(e.Args);
             CheckOptions(parser);
diff --git a/DS4Windows/DS4Control/GameBarIntegration.cs b/DS4Windows/DS4Control/GameBarIntegration.cs
index 588020f..f00c8dc 100644
--- a/DS4Windows/DS4Control/GameBarIntegration.cs
+++ b/DS4Windows/DS4Control/GameBarIntegration.cs
@@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Text;
@@ -40,11 +41,13 @@ public class GameBarIntegration
         private const int MaxAutomationVisitCount = 500;
         private const int MaxAutomationDepth = 5;
         private const int MaxDiagnosticTextLength = 160;
-        private const int LiveGameBarApiPollMs = 500;
+        private const int LiveGameBarApiPollMs = 1000;
         private const int LiveGameBarApiCacheMs = 1500;
-        private const int LiveGameBarApiHangMs = 1500;
+        private const int LiveGameBarApiProbeTimeoutMs = 1500;
+        private const int LiveGameBarApiHangMs = 2500;
         private const int LiveAutomationPollMs = 1000;
         private const int LiveAutomationCacheMs = 3000;
+        public const string ProbeArgument = "--ds4windows-gamebar-probe";
         private static readonly object detectionStatusLock = new object();
         private static readonly object gameBarApiPollLock = new object();
         private static bool gameBarApiPollRunning;
@@ -108,6 +111,46 @@ private struct RECT
             public int Bottom;
         }
 
+        public static bool TryRunProbeCommand(string[] args)
+        {
+            if (args == null ||
+                args.Length < 2 ||
+                !args[0].Equals(ProbeArgument, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            RunProbeCommand(args[1]);
+            return true;
+        }
+
+        private static void RunProbeCommand(string resultPath)
+        {
+            bool supported = false;
+            bool visible = false;
+            bool inputRedirected = false;
+            string status = "not started";
+
+            try
+            {
+                supported = TryGetGameBarApiStateCore(out visible, out inputRedirected, out status);
+            }
+            catch (Exception ex)
+            {
+                status = ex.GetType().Name + ": " + ex.Message;
+            }
+
+            try
+            {
+                File.WriteAllText(resultPath,
+                    $"{supported}|{visible}|{inputRedirected}|{SanitizeProbeStatus(status)}",
+                    Encoding.UTF8);
+            }
+            catch
+            {
+            }
+        }
+
         public bool IsRunningElevated()
         {
             using (WindowsIdentity identity = WindowsIdentity.GetCurrent())
@@ -230,7 +273,8 @@ private static bool IsGameBarVisibleByCachedGameBarApi(out string summary)
                         Stopwatch stopwatch = Stopwatch.StartNew();
                         try
                         {
-                            supported = TryGetGameBarApiStateCore(out apiVisible, out apiInputRedirected, out apiStatus);
+                            supported = TryGetGameBarApiStateOutOfProcess(LiveGameBarApiProbeTimeoutMs,
+                                out apiVisible, out apiInputRedirected, out apiStatus);
                             visible = supported && (apiVisible || apiInputRedirected);
                         }
                         catch (Exception ex)
@@ -403,38 +447,158 @@ private static bool TryGetGameBarApiStateCore(out bool visible, out bool inputRe
 
         private static string GetGameBarApiDiagnostics()
         {
-            bool supported = TryGetGameBarApiState(500, out bool visible, out bool inputRedirected, out string status);
+            bool supported = TryGetGameBarApiStateOutOfProcess(2000, out bool visible, out bool inputRedirected, out string status);
             return $"GameBarApi supported={supported} visible={visible} inputRedirected={inputRedirected} status='{TruncateDiagnosticText(status)}'";
         }
 
-        private static bool TryGetGameBarApiState(int timeoutMs, out bool visible, out bool inputRedirected, out string status)
+        private static bool TryParseProbeResult(string result, out bool supported, out bool visible, out bool inputRedirected, out string status)
         {
-            bool apiSupported = false;
-            bool apiVisible = false;
-            bool apiInputRedirected = false;
-            string apiStatus = "not started";
+            supported = false;
+            visible = false;
+            inputRedirected = false;
+            status = string.Empty;
 
-            Thread worker = new Thread(() =>
+            if (string.IsNullOrEmpty(result))
             {
-                apiSupported = TryGetGameBarApiStateCore(out apiVisible, out apiInputRedirected, out apiStatus);
-            });
+                return false;
+            }
 
-            worker.IsBackground = true;
-            worker.Name = "DS4Windows Game Bar API Probe";
-            worker.Start();
+            string[] parts = result.Split(new[] { '|' }, 4);
+            if (parts.Length < 4)
+            {
+                return false;
+            }
 
-            if (!worker.Join(timeoutMs))
+            if (!bool.TryParse(parts[0], out supported) ||
+                !bool.TryParse(parts[1], out visible) ||
+                !bool.TryParse(parts[2], out inputRedirected))
             {
+                supported = false;
                 visible = false;
                 inputRedirected = false;
-                status = $"timeout after {timeoutMs}ms";
                 return false;
             }
 
-            visible = apiVisible;
-            inputRedirected = apiInputRedirected;
-            status = apiStatus;
-            return apiSupported;
+            status = parts[3];
+            return true;
+        }
+
+        private static string SanitizeProbeStatus(string status)
+        {
+            if (string.IsNullOrEmpty(status))
+            {
+                return string.Empty;
+            }
+
+            return status.Replace('|', '/').Replace('\r', ' ').Replace('\n', ' ');
+        }
+
+        private static void TryKillProbeProcess(Process process)
+        {
+            try
+            {
+                if (process != null && !process.HasExited)
+                {
+                    process.Kill(true);
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        private static void TryDeleteProbeFile(string resultPath)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(resultPath) && File.Exists(resultPath))
+                {
+                    File.Delete(resultPath);
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        private static bool TryGetGameBarApiStateOutOfProcess(int timeoutMs, out bool visible, out bool inputRedirected, out string status)
+        {
+            visible = false;
+            inputRedirected = false;
+
+            string exePath = Environment.ProcessPath;
+            if (string.IsNullOrEmpty(exePath))
+            {
+                try
+                {
+                    exePath = Process.GetCurrentProcess().MainModule?.FileName;
+                }
+                catch
+                {
+                    exePath = string.Empty;
+                }
+            }
+
+            if (string.IsNullOrEmpty(exePath) || !File.Exists(exePath))
+            {
+                status = "probe exe not found";
+                return false;
+            }
+
+            string resultPath = Path.Combine(Path.GetTempPath(), "DS4Windows.GameBarProbe." + Guid.NewGuid().ToString("N") + ".txt");
+            Process process = null;
+            try
+            {
+                ProcessStartInfo startInfo = new ProcessStartInfo
+                {
+                    FileName = exePath,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden,
+                };
+
+                startInfo.ArgumentList.Add(ProbeArgument);
+                startInfo.ArgumentList.Add(resultPath);
+
+                process = Process.Start(startInfo);
+                if (process == null)
+                {
+                    status = "probe process did not start";
+                    return false;
+                }
+
+                if (!process.WaitForExit(timeoutMs))
+                {
+                    TryKillProbeProcess(process);
+                    status = $"probe timeout after {timeoutMs}ms";
+                    return false;
+                }
+
+                if (!File.Exists(resultPath))
+                {
+                    status = $"probe exited {process.ExitCode} without result";
+                    return false;
+                }
+
+                string result = File.ReadAllText(resultPath, Encoding.UTF8);
+                if (!TryParseProbeResult(result, out bool supported, out visible, out inputRedirected, out status))
+                {
+                    status = "invalid probe result: " + TruncateDiagnosticText(result);
+                    return false;
+                }
+
+                return supported;
+            }
+            catch (Exception ex)
+            {
+                status = ex.GetType().Name + ": " + ex.Message;
+                return false;
+            }
+            finally
+            {
+                process?.Dispose();
+                TryDeleteProbeFile(resultPath);
+            }
         }
 
         private static bool IsGameBarVisibleByAutomation()

From f60e7b3ed89771e0a3445f6f1d66742b498d6e1d Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 13:12:46 -0500
Subject: [PATCH 39/47] Suppress Game Bar probe startup cursor

---
 DS4Windows/DS4Control/GameBarIntegration.cs | 197 +++++++++++++++++---
 1 file changed, 169 insertions(+), 28 deletions(-)

diff --git a/DS4Windows/DS4Control/GameBarIntegration.cs b/DS4Windows/DS4Control/GameBarIntegration.cs
index f00c8dc..936f544 100644
--- a/DS4Windows/DS4Control/GameBarIntegration.cs
+++ b/DS4Windows/DS4Control/GameBarIntegration.cs
@@ -37,6 +37,12 @@ public class GameBarIntegration
         private const byte VK_G = 0x47;
         private const int KEYEVENTF_KEYUP = 0x0002;
         private const int DWMWA_CLOAKED = 14;
+        private const int STARTF_USESHOWWINDOW = 0x00000001;
+        private const int STARTF_FORCEOFFFEEDBACK = 0x00000080;
+        private const int SW_HIDE = 0;
+        private const uint CREATE_NO_WINDOW = 0x08000000;
+        private const uint WAIT_OBJECT_0 = 0x00000000;
+        private const uint WAIT_TIMEOUT = 0x00000102;
         private const int MaxAutomationDiagnosticRows = 20;
         private const int MaxAutomationVisitCount = 500;
         private const int MaxAutomationDepth = 5;
@@ -102,6 +108,30 @@ public class GameBarIntegration
         [DllImport("dwmapi.dll")]
         private static extern int DwmGetWindowAttribute(IntPtr hwnd, int dwAttribute, out int pvAttribute, int cbAttribute);
 
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern bool CreateProcess(string lpApplicationName,
+            StringBuilder lpCommandLine,
+            IntPtr lpProcessAttributes,
+            IntPtr lpThreadAttributes,
+            bool bInheritHandles,
+            uint dwCreationFlags,
+            IntPtr lpEnvironment,
+            string lpCurrentDirectory,
+            ref STARTUPINFO lpStartupInfo,
+            out PROCESS_INFORMATION lpProcessInformation);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern uint WaitForSingleObject(IntPtr hHandle, uint dwMilliseconds);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool GetExitCodeProcess(IntPtr hProcess, out uint lpExitCode);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool TerminateProcess(IntPtr hProcess, uint uExitCode);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool CloseHandle(IntPtr hObject);
+
         [StructLayout(LayoutKind.Sequential)]
         private struct RECT
         {
@@ -111,6 +141,38 @@ private struct RECT
             public int Bottom;
         }
 
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        private struct STARTUPINFO
+        {
+            public int cb;
+            public string lpReserved;
+            public string lpDesktop;
+            public string lpTitle;
+            public int dwX;
+            public int dwY;
+            public int dwXSize;
+            public int dwYSize;
+            public int dwXCountChars;
+            public int dwYCountChars;
+            public int dwFillAttribute;
+            public int dwFlags;
+            public short wShowWindow;
+            public short cbReserved2;
+            public IntPtr lpReserved2;
+            public IntPtr hStdInput;
+            public IntPtr hStdOutput;
+            public IntPtr hStdError;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct PROCESS_INFORMATION
+        {
+            public IntPtr hProcess;
+            public IntPtr hThread;
+            public int dwProcessId;
+            public int dwThreadId;
+        }
+
         public static bool TryRunProbeCommand(string[] args)
         {
             if (args == null ||
@@ -493,18 +555,118 @@ private static string SanitizeProbeStatus(string status)
             return status.Replace('|', '/').Replace('\r', ' ').Replace('\n', ' ');
         }
 
-        private static void TryKillProbeProcess(Process process)
+        private static bool TryRunProbeProcess(string exePath, string resultPath, int timeoutMs, out int exitCode, out string status)
         {
+            exitCode = -1;
+            status = string.Empty;
+
+            STARTUPINFO startupInfo = new STARTUPINFO
+            {
+                cb = Marshal.SizeOf<STARTUPINFO>(),
+                dwFlags = STARTF_USESHOWWINDOW | STARTF_FORCEOFFFEEDBACK,
+                wShowWindow = SW_HIDE,
+            };
+
+            StringBuilder commandLine = new StringBuilder(QuoteCommandLineArgument(exePath) + " " +
+                QuoteCommandLineArgument(ProbeArgument) + " " +
+                QuoteCommandLineArgument(resultPath));
+            string workingDirectory = Path.GetDirectoryName(exePath);
+
+            if (!CreateProcess(exePath,
+                commandLine,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                false,
+                CREATE_NO_WINDOW,
+                IntPtr.Zero,
+                workingDirectory,
+                ref startupInfo,
+                out PROCESS_INFORMATION processInfo))
+            {
+                status = "CreateProcess failed: " + Marshal.GetLastWin32Error();
+                return false;
+            }
+
             try
             {
-                if (process != null && !process.HasExited)
+                uint waitResult = WaitForSingleObject(processInfo.hProcess, (uint)Math.Max(1, timeoutMs));
+                if (waitResult == WAIT_TIMEOUT)
                 {
-                    process.Kill(true);
+                    TerminateProcess(processInfo.hProcess, 1);
+                    status = $"probe timeout after {timeoutMs}ms";
+                    return false;
+                }
+
+                if (waitResult != WAIT_OBJECT_0)
+                {
+                    status = "WaitForSingleObject failed: " + waitResult;
+                    return false;
+                }
+
+                if (GetExitCodeProcess(processInfo.hProcess, out uint nativeExitCode))
+                {
+                    exitCode = unchecked((int)nativeExitCode);
                 }
+
+                return true;
             }
-            catch
+            finally
             {
+                if (processInfo.hThread != IntPtr.Zero)
+                {
+                    CloseHandle(processInfo.hThread);
+                }
+
+                if (processInfo.hProcess != IntPtr.Zero)
+                {
+                    CloseHandle(processInfo.hProcess);
+                }
+            }
+        }
+
+        private static string QuoteCommandLineArgument(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return "\"\"";
+            }
+
+            StringBuilder builder = new StringBuilder();
+            builder.Append('"');
+            int backslashCount = 0;
+
+            foreach (char c in value)
+            {
+                if (c == '\\')
+                {
+                    backslashCount++;
+                    continue;
+                }
+
+                if (c == '"')
+                {
+                    builder.Append('\\', backslashCount * 2 + 1);
+                    builder.Append('"');
+                    backslashCount = 0;
+                    continue;
+                }
+
+                if (backslashCount > 0)
+                {
+                    builder.Append('\\', backslashCount);
+                    backslashCount = 0;
+                }
+
+                builder.Append(c);
             }
+
+            if (backslashCount > 0)
+            {
+                builder.Append('\\', backslashCount * 2);
+            }
+
+            builder.Append('"');
+            return builder.ToString();
         }
 
         private static void TryDeleteProbeFile(string resultPath)
@@ -546,37 +708,17 @@ private static bool TryGetGameBarApiStateOutOfProcess(int timeoutMs, out bool vi
             }
 
             string resultPath = Path.Combine(Path.GetTempPath(), "DS4Windows.GameBarProbe." + Guid.NewGuid().ToString("N") + ".txt");
-            Process process = null;
             try
             {
-                ProcessStartInfo startInfo = new ProcessStartInfo
+                if (!TryRunProbeProcess(exePath, resultPath, timeoutMs, out int exitCode, out string launchStatus))
                 {
-                    FileName = exePath,
-                    UseShellExecute = false,
-                    CreateNoWindow = true,
-                    WindowStyle = ProcessWindowStyle.Hidden,
-                };
-
-                startInfo.ArgumentList.Add(ProbeArgument);
-                startInfo.ArgumentList.Add(resultPath);
-
-                process = Process.Start(startInfo);
-                if (process == null)
-                {
-                    status = "probe process did not start";
-                    return false;
-                }
-
-                if (!process.WaitForExit(timeoutMs))
-                {
-                    TryKillProbeProcess(process);
-                    status = $"probe timeout after {timeoutMs}ms";
+                    status = launchStatus;
                     return false;
                 }
 
                 if (!File.Exists(resultPath))
                 {
-                    status = $"probe exited {process.ExitCode} without result";
+                    status = $"probe exited {exitCode} without result";
                     return false;
                 }
 
@@ -596,7 +738,6 @@ private static bool TryGetGameBarApiStateOutOfProcess(int timeoutMs, out bool vi
             }
             finally
             {
-                process?.Dispose();
                 TryDeleteProbeFile(resultPath);
             }
         }

From 3a7e45508dabe50e316034e34db4b35cca0b3769 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Thu, 11 Jun 2026 13:34:36 -0500
Subject: [PATCH 40/47] Show full launch program path in special actions

---
 DS4Windows/DS4Forms/SpecialActionEditor.xaml   | 18 ++++++++++++------
 .../DS4Forms/SpecialActionEditor.xaml.cs       |  2 +-
 .../ViewModels/SpecialActionsListViewModel.cs  |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/DS4Windows/DS4Forms/SpecialActionEditor.xaml b/DS4Windows/DS4Forms/SpecialActionEditor.xaml
index 431c1de..49bc2de 100644
--- a/DS4Windows/DS4Forms/SpecialActionEditor.xaml
+++ b/DS4Windows/DS4Forms/SpecialActionEditor.xaml
@@ -403,12 +403,18 @@
                                     <xctk:DecimalUpDown Value="{Binding Delay}" Width="60" Minimum="0" Maximum="60" FormatString= "F2" Increment="0.5" />
                                     <Label Content="secs" />
                                 </StackPanel>
-                                <Button x:Name="launchProgBrowseBtn" Content="{lex:Loc Browse}" Margin="{StaticResource spaceMargin}"
-                                        Click="LaunchProgBrowseBtn_Click" />
-                                <StackPanel Orientation="Horizontal" Margin="{StaticResource spaceMargin}">
-                                    <Label Content="{Binding ProgramName}" ToolTip="{Binding Filepath}" Width="150" HorizontalContentAlignment="Center" />
-                                    <Image Source="{Binding ProgramIcon}" Width="32" Height="32" Margin="10,0,0,0" />
-                                </StackPanel>
+                                <Grid Margin="{StaticResource spaceMargin}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="90" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBox Text="{Binding Filepath, Mode=OneWay}" ToolTip="{Binding Filepath}"
+                                             IsReadOnly="True" VerticalContentAlignment="Center"
+                                             TextWrapping="NoWrap" HorizontalScrollBarVisibility="Auto"
+                                             Margin="0,0,8,0" />
+                                    <Button x:Name="launchProgBrowseBtn" Grid.Column="1" Content="{lex:Loc Browse}"
+                                            Click="LaunchProgBrowseBtn_Click" />
+                                </Grid>
                                 <StackPanel Margin="{StaticResource spaceMargin}">
                                     <Label Content="Arguments"/>
                                     <TextBox Text="{Binding Arguments}" />
diff --git a/DS4Windows/DS4Forms/SpecialActionEditor.xaml.cs b/DS4Windows/DS4Forms/SpecialActionEditor.xaml.cs
index 1ef496a..1282eef 100644
--- a/DS4Windows/DS4Forms/SpecialActionEditor.xaml.cs
+++ b/DS4Windows/DS4Forms/SpecialActionEditor.xaml.cs
@@ -505,7 +505,7 @@ private void LaunchProgBrowseBtn_Click(object sender, RoutedEventArgs e)
             dialog.Multiselect = false;
             dialog.AddExtension = true;
             dialog.DefaultExt = ".exe";
-            dialog.Filter = "Exe (*.exe)|*.exe|Batch (*.bat,*.cmd)|*.bat;*.cmd|All Files (*.*)|*.*";
+            dialog.Filter = "Exe (*.exe)|*.exe|Scripts (*.bat,*.cmd,*.ps1)|*.bat;*.cmd;*.ps1|All Files (*.*)|*.*";
             dialog.Title = "Select Program";
 
             dialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
diff --git a/DS4Windows/DS4Forms/ViewModels/SpecialActionsListViewModel.cs b/DS4Windows/DS4Forms/ViewModels/SpecialActionsListViewModel.cs
index f4d3e9c..2678754 100644
--- a/DS4Windows/DS4Forms/ViewModels/SpecialActionsListViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/SpecialActionsListViewModel.cs
@@ -131,7 +131,7 @@ public string GetActionDisplayName(SpecialAction action)
                     displayName = Properties.Resources.Macro + (action.keyType.HasFlag(DS4KeyType.ScanCode) ? " (" + Properties.Resources.ScanCode + ")" : "");
                     break;
                 case SpecialAction.ActionTypeId.Program:
-                    displayName = Properties.Resources.LaunchProgram.Replace("*program*", Path.GetFileNameWithoutExtension(action.details));
+                    displayName = Properties.Resources.LaunchProgram.Replace("*program*", Path.GetFileName(action.details));
                     break;
                 case SpecialAction.ActionTypeId.Profile:
                     displayName = Properties.Resources.LoadProfile.Replace("*profile*", action.details);

From 319190d13e3335a9b9f1a6111cbfd7793cb8680f Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Fri, 12 Jun 2026 18:14:56 -0500
Subject: [PATCH 41/47] Handle missing Xbox Game Bar protocol

---
 DS4Windows/DS4Control/GameBarIntegration.cs | 54 +++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/DS4Windows/DS4Control/GameBarIntegration.cs b/DS4Windows/DS4Control/GameBarIntegration.cs
index 936f544..1520a96 100644
--- a/DS4Windows/DS4Control/GameBarIntegration.cs
+++ b/DS4Windows/DS4Control/GameBarIntegration.cs
@@ -25,6 +25,7 @@ You should have received a copy of the GNU General Public License
 using System.Text;
 using System.Threading;
 using System.Windows.Automation;
+using Microsoft.Win32;
 using Windows.Foundation.Metadata;
 using Windows.Gaming.UI;
 using WinRect = System.Windows.Rect;
@@ -72,6 +73,8 @@ public class GameBarIntegration
         private static bool automationPollCachedVisible;
         private static DateTime automationPollLastStartedUtc = DateTime.MinValue;
         private static DateTime automationPollLastCompletedUtc = DateTime.MinValue;
+        private static bool? gameBarProtocolRegistered;
+        private static int gameBarMissingWarningLogged;
 
         private delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
 
@@ -224,6 +227,12 @@ public bool IsRunningElevated()
 
         public string OpenGameBar()
         {
+            if (!IsGameBarProtocolRegistered())
+            {
+                LogMissingGameBarWarning();
+                return "Game Bar not opened: ms-gamebar protocol is not registered";
+            }
+
             keybd_event(VK_LWIN, 0, 0, UIntPtr.Zero);
             keybd_event(VK_G, 0, 0, UIntPtr.Zero);
             keybd_event(VK_G, 0, KEYEVENTF_KEYUP, UIntPtr.Zero);
@@ -231,6 +240,51 @@ public string OpenGameBar()
             return "keybd_event Win+G sent";
         }
 
+        private static bool IsGameBarProtocolRegistered()
+        {
+            if (gameBarProtocolRegistered.HasValue)
+            {
+                return gameBarProtocolRegistered.Value;
+            }
+
+            bool registered = RegistryProtocolExists(Registry.CurrentUser, @"Software\Classes\ms-gamebar") ||
+                RegistryProtocolExists(Registry.ClassesRoot, "ms-gamebar");
+            gameBarProtocolRegistered = registered;
+            return registered;
+        }
+
+        private static bool RegistryProtocolExists(RegistryKey root, string subKeyName)
+        {
+            try
+            {
+                using RegistryKey key = root.OpenSubKey(subKeyName);
+                if (key == null)
+                {
+                    return false;
+                }
+
+                object urlProtocol = key.GetValue("URL Protocol");
+                return urlProtocol != null ||
+                    !string.IsNullOrWhiteSpace(key.GetValue(null) as string);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private static void LogMissingGameBarWarning()
+        {
+            if (Interlocked.Exchange(ref gameBarMissingWarningLogged, 1) == 1)
+            {
+                return;
+            }
+
+            const string message = "Xbox Game Bar is not installed or its ms-gamebar protocol handler is not registered. Install or repair Xbox Game Bar from the Microsoft Store, then restart DS4Windows to use Game Bar profile support.";
+            AppLogger.LogToGui(message, true);
+            AppLogger.LogToTray(message, true, true);
+        }
+
         public string LastDetectionSummary
         {
             get

From 15a28fec5b33f388f8741dbb3f0c05839a02ade0 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 14 Jun 2026 15:02:20 -0500
Subject: [PATCH 42/47] Bump version to 4.0.2.2

---
 DS4Windows/DS4WinWPF.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/DS4Windows/DS4WinWPF.csproj b/DS4Windows/DS4WinWPF.csproj
index 1c1ac01..538de82 100644
--- a/DS4Windows/DS4WinWPF.csproj
+++ b/DS4Windows/DS4WinWPF.csproj
@@ -15,10 +15,10 @@
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
 		<EnableNETAnalyzers>false</EnableNETAnalyzers>
 		<ServerGarbageCollection>true</ServerGarbageCollection>
-		<AssemblyVersion>4.0.2.1</AssemblyVersion>
-		<FileVersion>4.0.2.1</FileVersion>
-		<Version>4.0.2.1</Version>
-		<InformationalVersion>4.0.2.1</InformationalVersion>
+		<AssemblyVersion>4.0.2.2</AssemblyVersion>
+		<FileVersion>4.0.2.2</FileVersion>
+		<Version>4.0.2.2</Version>
+		<InformationalVersion>4.0.2.2</InformationalVersion>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">x64</Platform>

From bd3b6b47af8bd0d0d7eb7e0c77046983e63bb5a4 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 14 Jun 2026 16:45:48 -0500
Subject: [PATCH 43/47] Ignore beta releases in updater checks

---
 DS4Windows/DS4Control/ScpUtil.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index d95370c..e5460cd 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -3393,6 +3393,14 @@ public static bool TryParseReleaseVersion(string tagName, out Version version)
             return versionMatch.Success && Version.TryParse(versionMatch.Value, out version);
         }
 
+        private static bool IsStableRelease(GithubRelease release)
+        {
+            if (release is null || release.PreRelease) return false;
+
+            string tagName = release.TagName ?? string.Empty;
+            return !Regex.IsMatch(tagName, @"(?i)(alpha|beta|preview|pre-release|prerelease|rc)");
+        }
+
         // Much more compact and elegant way of checking if there is a new update available than the
         // shenanigans with fetching newest.txt and using a .txt file as a DTO instead of simply
         // passing a string to the function that displays the updater window.
@@ -3420,6 +3428,7 @@ public static bool CheckNewerVersionExists(out Version version, bool allowCached
 
                 foreach (var release in task.Result ?? Array.Empty<GithubRelease>())
                 {
+                    if (!IsStableRelease(release)) continue;
                     if (!TryParseReleaseVersion(release.TagName, out var parsedVersion)) continue;
                     if (parsedVersion > version) version = parsedVersion;
                 }
@@ -3456,6 +3465,7 @@ public static async Task<Dictionary<Version, string>> GetChangelog(bool allVersi
 
             foreach (var release in releases)
             {
+                if (!IsStableRelease(release)) continue;
                 if (!TryParseReleaseVersion(release.TagName, out var parsedVersion)) continue;
 
                 if (!allVersions && parsedVersion <= currentVersion) break;

From 93784421463dbff4d67b29e07b8b7ed5467daa4c Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 14 Jun 2026 17:23:10 -0500
Subject: [PATCH 44/47] Detect Moonlight virtual DS4 v2 controllers

---
 DS4Windows/DS4Library/DS4Devices.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/DS4Windows/DS4Library/DS4Devices.cs b/DS4Windows/DS4Library/DS4Devices.cs
index ab0efaf..1e17f54 100644
--- a/DS4Windows/DS4Library/DS4Devices.cs
+++ b/DS4Windows/DS4Library/DS4Devices.cs
@@ -329,6 +329,13 @@ private static bool HasViGEmVirtualDS4Identity(HidDevice hDevice, string serial)
                 serial.StartsWith(VigemVirtualDS4MacPrefix, StringComparison.OrdinalIgnoreCase);
         }
 
+        private static bool IsKnownVirtualDS4(HidDevice hDevice, bool isVirtualDevice)
+        {
+            return isVirtualDevice &&
+                hDevice.Attributes.VendorId == SONY_VID &&
+                VirtualDS4Pids.Contains(hDevice.Attributes.ProductId);
+        }
+
         private static bool IsRealDS4(HidDevice hDevice)
         {
             // Our own virtual output controllers are never valid input, regardless of
@@ -355,7 +362,7 @@ private static bool IsRealDS4(HidDevice hDevice)
             if (!Global.UseAdvancedMoonlight)
             {
                 // this approach should work on most devices, but not on my pc for some reason
-                if (hDevice.Attributes.VendorId == 1356 && hDevice.Attributes.ProductId == 1476)
+                if (IsKnownVirtualDS4(hDevice, isVirtualDevice))
                 {
                     return true;
                 }
@@ -367,11 +374,11 @@ private static bool IsRealDS4(HidDevice hDevice)
                 if (!DetectNewControllers)
                 {
                     var curTimestamp = Stopwatch.GetTimestamp();
-                    if (curTimestamp - timestamp > 5 * TimeSpan.TicksPerSecond) DetectNewControllers = true;
+                    if (curTimestamp - timestamp > 5 * Stopwatch.Frequency) DetectNewControllers = true;
                 }
 
                 // Moonlight detection
-                if (hDevice.Attributes.VendorId == 1356 && hDevice.Attributes.ProductId == 1476)
+                if (IsKnownVirtualDS4(hDevice, isVirtualDevice))
                 {
                     if (DetectNewControllers)
                     {
@@ -498,7 +505,8 @@ public static void findControllers()
                             serial = hDevice.ReadSerial(DS4Device.SERIAL_FEATURE_ID);
                         }
 
-                        if (HasViGEmVirtualDS4Identity(hDevice, serial))
+                        if (HasViGEmVirtualDS4Identity(hDevice, serial) &&
+                            !Global.UseMoonlight)
                         {
                             hDevice.Dispose();
                             continue;

From e3a2a194977ce49c792ef398f76ea39a71796ff2 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 14 Jun 2026 17:17:27 -0500
Subject: [PATCH 45/47] Harden VIIPER HidHide containment

---
 DS4Windows/DS4Control/ControlService.cs   | 152 ++++++++++++++++++++--
 DS4Windows/DS4Control/HidHideAPIDevice.cs |  10 +-
 2 files changed, 147 insertions(+), 15 deletions(-)

diff --git a/DS4Windows/DS4Control/ControlService.cs b/DS4Windows/DS4Control/ControlService.cs
index e84c305..22cecdb 100644
--- a/DS4Windows/DS4Control/ControlService.cs
+++ b/DS4Windows/DS4Control/ControlService.cs
@@ -43,6 +43,10 @@ public class ControlService
         private readonly DualSenseAudioPassthrough dualSenseAudioPassthrough = new DualSenseAudioPassthrough();
         private readonly DualSenseMicrophonePassthrough dualSenseMicrophonePassthrough = new DualSenseMicrophonePassthrough();
         private readonly GameBarIntegration gameBarIntegration = new GameBarIntegration();
+        private readonly object hidHideSessionLock = new object();
+        private readonly HashSet<string> hidHideSessionManagedInstanceIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private readonly HashSet<string> hidHidePersistentManagedInstanceIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private bool? hidHideActiveStateBeforeManagedSession;
         // Might be useful for ScpVBus build
         public const int EXPANDED_CONTROLLER_COUNT = 8;
         public const int MAX_DS4_CONTROLLER_COUNT = Global.MAX_DS4_CONTROLLER_COUNT;
@@ -748,6 +752,7 @@ public void PrepareDS4DeviceInit(DS4Device device)
 
         public void ShutDown()
         {
+            ReleaseHidHideManagedDevices();
             outputslotMan.ShutDown();
             OutputSlotPersist.WriteConfig(outputslotMan);
 
@@ -869,7 +874,7 @@ public void UpdateHidHideAttributes()
                 hidDeviceHidingForced = false; // No known equivalent in HidHide
                 hidDeviceHidingEnabled = false;
 
-                using (HidHideAPIDevice hidHideDevice = new HidHideAPIDevice())
+                using (HidHideAPIDevice hidHideDevice = new HidHideAPIDevice(writeAccess: false))
                 {
                     if (!hidHideDevice.IsOpen())
                     {
@@ -961,28 +966,148 @@ private void ChangeExclusiveStatus(DS4Device dev)
         }
 
         /// <summary>
-        /// Adds the device to HidHide's process-lifetime (session) blacklist.
-        /// The entry is automatically removed by HidHide when DS4Windows exits --
-        /// cleanly or otherwise -- so other apps (Steam, OpenRGB) can reclaim the
-        /// device without requiring a reboot or manual HidHide configuration.
-        /// Falls back silently if the installed HidHide version predates session
-        /// blacklist support.
+        /// Adds the device to HidHide for this DS4Windows run and enables hiding.
+        /// Session entries stay active across Stop/Start inside this process and
+        /// are automatically removed by HidHide when DS4Windows exits. If session
+        /// blacklist writes fail, fall back to a normal blacklist entry and remove
+        /// only entries DS4Windows added on Stop/Shutdown.
         /// </summary>
-        private void TryAddDeviceToSessionBlacklist(DS4Device dev)
+        private bool TryAddDeviceToSessionBlacklist(DS4Device dev)
         {
-            if (!Global.hidHideInstalled) return;
+            if (!Global.hidHideInstalled || dev == null) return false;
+
+            string instanceId = Global.GetInstanceIdFromDevicePath(dev.HidDevice.DevicePath);
+            if (string.IsNullOrEmpty(instanceId)) return false;
+
+            bool alreadyManaged;
+            lock (hidHideSessionLock)
+            {
+                alreadyManaged = hidHideSessionManagedInstanceIds.Contains(instanceId) ||
+                    hidHidePersistentManagedInstanceIds.Contains(instanceId);
+            }
+
             try
             {
-                string instanceId = Global.GetInstanceIdFromDevicePath(dev.HidDevice.DevicePath);
-                if (string.IsNullOrEmpty(instanceId)) return;
+                using (HidHideAPIDevice hidHideDevice = new HidHideAPIDevice())
+                {
+                    if (!hidHideDevice.IsOpen()) return false;
+
+                    bool active = hidHideDevice.GetActiveState();
+                    lock (hidHideSessionLock)
+                    {
+                        hidHideActiveStateBeforeManagedSession ??= active;
+                    }
+
+                    if (!active)
+                    {
+                        hidHideDevice.SetActiveState(true);
+                    }
+
+                    if (!alreadyManaged && hidHideDevice.AddSessionBlacklist(new List<string> { instanceId }))
+                    {
+                        lock (hidHideSessionLock)
+                        {
+                            hidHideSessionManagedInstanceIds.Add(instanceId);
+                        }
+
+                        LogDebug($"HidHide session hiding enabled for {dev.DisplayName} ({instanceId})", false);
+                    }
+                    else if (!alreadyManaged && !EnsurePersistentHidHideBlacklist(hidHideDevice, instanceId, dev))
+                    {
+                        return false;
+                    }
+
+                    UpdateHidHideAttributes();
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogDebug($"HidHide session setup failed for {dev.DisplayName}: {ex.Message}", true);
+                return false;
+            }
+        }
+
+        private bool EnsurePersistentHidHideBlacklist(HidHideAPIDevice hidHideDevice, string instanceId, DS4Device dev)
+        {
+            List<string> instances = hidHideDevice.GetBlacklist()
+                .Where(item => !string.IsNullOrWhiteSpace(item))
+                .ToList();
+
+            if (instances.Any(item => string.Equals(item, instanceId, StringComparison.OrdinalIgnoreCase)))
+            {
+                StartupDiag($"HidHide persistent blacklist already contains {instanceId}");
+                return true;
+            }
+
+            instances.Add(instanceId);
+            if (!hidHideDevice.SetBlacklist(instances))
+            {
+                StartupDiag($"HidHide persistent blacklist fallback failed for {dev.DisplayName} ({instanceId})");
+                return false;
+            }
+
+            lock (hidHideSessionLock)
+            {
+                hidHidePersistentManagedInstanceIds.Add(instanceId);
+            }
+
+            LogDebug($"HidHide persistent hiding enabled for {dev.DisplayName} ({instanceId})", false);
+            return true;
+        }
+
+        private void ReleaseHidHideManagedDevices()
+        {
+            if (!Global.hidHideInstalled) return;
+
+            List<string> persistentIds;
+            bool? restoreActiveState;
+            lock (hidHideSessionLock)
+            {
+                persistentIds = hidHidePersistentManagedInstanceIds.ToList();
+                restoreActiveState = hidHideActiveStateBeforeManagedSession;
+                hidHideSessionManagedInstanceIds.Clear();
+                hidHidePersistentManagedInstanceIds.Clear();
+                hidHideActiveStateBeforeManagedSession = null;
+            }
 
+            if (persistentIds.Count == 0 && restoreActiveState is null) return;
+
+            try
+            {
                 using (HidHideAPIDevice hidHideDevice = new HidHideAPIDevice())
                 {
                     if (!hidHideDevice.IsOpen()) return;
-                    hidHideDevice.AddSessionBlacklist(new System.Collections.Generic.List<string> { instanceId });
+
+                    hidHideDevice.ClearSessionBlacklist();
+
+                    if (persistentIds.Count > 0)
+                    {
+                        List<string> instances = hidHideDevice.GetBlacklist()
+                            .Where(item => !string.IsNullOrWhiteSpace(item))
+                            .ToList();
+
+                        int removed = instances.RemoveAll(item =>
+                            persistentIds.Any(managed => string.Equals(managed, item, StringComparison.OrdinalIgnoreCase)));
+
+                        if (removed > 0 && hidHideDevice.SetBlacklist(instances))
+                        {
+                            StartupDiag($"Released {removed} DS4Windows-managed HidHide blacklist entries");
+                        }
+                    }
+
+                    if (restoreActiveState == false)
+                    {
+                        hidHideDevice.SetActiveState(false);
+                    }
+
+                    UpdateHidHideAttributes();
                 }
             }
-            catch { /* HidHide version predates session blacklist -- ignore */ }
+            catch (Exception ex)
+            {
+                StartupDiag($"ReleaseHidHideManagedDevices exception {ex.GetType().Name}: {ex.Message}");
+            }
         }
 
         private void TestQueueBus(Action temp)
@@ -2201,6 +2326,7 @@ public bool Stop(bool showlog = true, bool immediateUnplug = false, bool dispose
             }
 
             runHotPlug = false;
+            ReleaseHidHideManagedDevices();
             StartupDiag("ControlService.Stop before stopped events");
             ServiceStopped?.Invoke(this, EventArgs.Empty);
             RunningChanged?.Invoke(this, EventArgs.Empty);
diff --git a/DS4Windows/DS4Control/HidHideAPIDevice.cs b/DS4Windows/DS4Control/HidHideAPIDevice.cs
index 87d4ab3..383643f 100644
--- a/DS4Windows/DS4Control/HidHideAPIDevice.cs
+++ b/DS4Windows/DS4Control/HidHideAPIDevice.cs
@@ -42,10 +42,16 @@ class HidHideAPIDevice : IDisposable
 
         private SafeHandle hidHideHandle;
 
-        public HidHideAPIDevice()
+        public HidHideAPIDevice(bool writeAccess = true)
         {
+            uint desiredAccess = NativeMethods.GENERIC_READ;
+            if (writeAccess)
+            {
+                desiredAccess |= NativeMethods.GENERIC_WRITE;
+            }
+
             hidHideHandle = NativeMethods.CreateFile(CONTROL_DEVICE_FILENAME,
-                    NativeMethods.GENERIC_READ,
+                    desiredAccess,
                     NativeMethods.FILE_SHARE_READ | NativeMethods.FILE_SHARE_WRITE,
                     IntPtr.Zero,
                     NativeMethods.OpenExisting,

From ba4bdcb79e4f009c8850d2b99c976b20ae1b34e9 Mon Sep 17 00:00:00 2001
From: strifeforlyfe <hbashton13@gmail.com>
Date: Sun, 14 Jun 2026 17:30:26 -0500
Subject: [PATCH 46/47] Bump version to 4.0.2.3

---
 DS4Windows/DS4WinWPF.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/DS4Windows/DS4WinWPF.csproj b/DS4Windows/DS4WinWPF.csproj
index 538de82..c6bc351 100644
--- a/DS4Windows/DS4WinWPF.csproj
+++ b/DS4Windows/DS4WinWPF.csproj
@@ -15,10 +15,10 @@
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
 		<EnableNETAnalyzers>false</EnableNETAnalyzers>
 		<ServerGarbageCollection>true</ServerGarbageCollection>
-		<AssemblyVersion>4.0.2.2</AssemblyVersion>
-		<FileVersion>4.0.2.2</FileVersion>
-		<Version>4.0.2.2</Version>
-		<InformationalVersion>4.0.2.2</InformationalVersion>
+		<AssemblyVersion>4.0.2.3</AssemblyVersion>
+		<FileVersion>4.0.2.3</FileVersion>
+		<Version>4.0.2.3</Version>
+		<InformationalVersion>4.0.2.3</InformationalVersion>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">x64</Platform>

From 4f932abf3b4045f8b0a8d40cf40d350e697490b3 Mon Sep 17 00:00:00 2001
From: Cameron Beeley <cameron.beeley@gmail.com>
Date: Fri, 10 Jul 2026 15:45:03 +0100
Subject: [PATCH 47/47] test: cover AppSettingsDTO deserialization with
 non-default values

The XML string-proxy setters in AppSettingsDTO (bool/int/enum TryParse ->
assign) were unasserted: mutation testing showed that negating the parse guard
or deleting the assignment both survived, because the existing fixture only
used default values. This adds a round-trip test that deserializes non-default
values and asserts each typed property, so a setter that fails to assign is
now caught.

Part of #37
---
 DS4WindowsTests/AppSettingsTests.cs | 72 +++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/DS4WindowsTests/AppSettingsTests.cs b/DS4WindowsTests/AppSettingsTests.cs
index 648777e..67cdadb 100644
--- a/DS4WindowsTests/AppSettingsTests.cs
+++ b/DS4WindowsTests/AppSettingsTests.cs
@@ -184,5 +184,77 @@ public void CheckSettingsSave()
 
             Assert.AreEqual(appSettingsXml, testStr);
         }
+
+        [TestMethod]
+        public void CheckSettingsDeserializeNonDefaultValues()
+        {
+            var nonDefaultSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
+
+<Profile>
+  <Notifications>1</Notifications>
+  <ProfileChangedNotification>True</ProfileChangedNotification>
+  <DisconnectBTAtStop>True</DisconnectBTAtStop>
+  <SwipeProfiles>False</SwipeProfiles>
+  <QuickCharge>True</QuickCharge>
+  <CloseMinimizes>True</CloseMinimizes>
+  <DownloadLang>True</DownloadLang>
+  <FlashWhenLate>False</FlashWhenLate>
+  <AppIcon>Colored</AppIcon>
+  <AppTheme>Dark</AppTheme>
+  <UseOSCServer>True</UseOSCServer>
+  <InterpretingOscMonitoring>True</InterpretingOscMonitoring>
+  <UseOSCSender>True</UseOSCSender>
+  <UseUDPServer>True</UseUDPServer>
+  <UseCustomSteamFolder>True</UseCustomSteamFolder>
+  <AutoProfileRevertDefaultProfile>False</AutoProfileRevertDefaultProfile>
+  <UDPServerSmoothingOptions>
+    <UseSmoothing>True</UseSmoothing>
+  </UDPServerSmoothingOptions>
+  <DeviceOptions>
+    <DS4SupportSettings>
+      <Enabled>False</Enabled>
+    </DS4SupportSettings>
+    <DualSenseSupportSettings>
+      <Enabled>True</Enabled>
+    </DualSenseSupportSettings>
+    <SwitchProSupportSettings>
+      <Enabled>True</Enabled>
+    </SwitchProSupportSettings>
+    <JoyConSupportSettings>
+      <Enabled>True</Enabled>
+    </JoyConSupportSettings>
+    <DS3SupportSettings>
+      <Enabled>True</Enabled>
+    </DS3SupportSettings>
+  </DeviceOptions>
+</Profile>";
+
+            XmlSerializer serializer = new XmlSerializer(typeof(AppSettingsDTO));
+            using StringReader sr = new StringReader(nonDefaultSettingsXml);
+            AppSettingsDTO dto = serializer.Deserialize(sr) as AppSettingsDTO;
+
+            Assert.AreEqual(1, dto.Notifications);
+            Assert.AreEqual(true, dto.ProfileChangedNotification);
+            Assert.AreEqual(true, dto.DisconnectBTAtStop);
+            Assert.AreEqual(false, dto.SwipeProfiles);
+            Assert.AreEqual(true, dto.QuickCharge);
+            Assert.AreEqual(true, dto.CloseMinimizes);
+            Assert.AreEqual(true, dto.DownloadLang);
+            Assert.AreEqual(false, dto.FlashWhenLate);
+            Assert.AreEqual(TrayIconChoice.Colored, dto.AppIcon);
+            Assert.AreEqual(AppThemeChoice.Dark, dto.AppTheme);
+            Assert.AreEqual(true, dto.UseOSCServer);
+            Assert.AreEqual(true, dto.InterpretingOscMonitoring);
+            Assert.AreEqual(true, dto.UseOSCSender);
+            Assert.AreEqual(true, dto.UseUDPServer);
+            Assert.AreEqual(true, dto.UseCustomSteamFolder);
+            Assert.AreEqual(false, dto.AutoProfileRevertDefaultProfile);
+            Assert.AreEqual(true, dto.UDPServerSmoothingOptions.UseSmoothing);
+            Assert.AreEqual(false, dto.DeviceOptions.DS4SupportSettings.Enabled);
+            Assert.AreEqual(true, dto.DeviceOptions.DualSenseSupportSettings.Enabled);
+            Assert.AreEqual(true, dto.DeviceOptions.SwitchProSupportSettings.Enabled);
+            Assert.AreEqual(true, dto.DeviceOptions.JoyConSupportSettings.Enabled);
+            Assert.AreEqual(true, dto.DeviceOptions.DS3SupportSettings.Enabled);
+        }
     }
 }