Merge pull request #38 from Docteh/WhileBoneHeld

Fix small mistake
OpenShock · Nov 14, 2024 · 448b625 · 448b625
2 parents 449123d + 47f501a
commit 448b625
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/ShockOsc/Services/ShockOsc.cs b/ShockOsc/Services/ShockOsc.cs
@@ -610,10 +610,7 @@ private async Task CheckProgramGroup(ProgramGroup programGroup, Guid pos, Behavi
             intensity = GetPhysbonePullIntensity(programGroup, programGroup.LastStretchValue);
             programGroup.LastStretchValue = 0;
 
-            var heldAction = _configUtils.GetGroupOrGlobal(programGroup, behaviourConfig => behaviourConfig.WhileBoneHeld,
-                group => group.OverrideBoneHeldAction);
-
-            InstantAction(programGroup, GetDuration(programGroup), intensity, heldAction.ToControlType(), true);
+            InstantAction(programGroup, GetDuration(programGroup), intensity, releaseAction.ToControlType(), true);
             return;
         }
 

diff --git a/ShockOsc/Ui/Pages/Dash/Tabs/GroupsTab.razor b/ShockOsc/Ui/Pages/Dash/Tabs/GroupsTab.razor
@@ -250,7 +250,7 @@
         <MudCollapse Expanded="CurrentGroup.OverrideBoneHeldAction">
             <br/>
 
-            <MudSelect Class="option-width" @bind-Value="CurrentGroup.OverrideBoneHeldAction" Label="When PhysBone Held" @bind-Value:after="OnGroupSettingsValueChange">
+            <MudSelect Class="option-width" @bind-Value="CurrentGroup.WhileBoneHeld" Label="When PhysBone Held" @bind-Value:after="OnGroupSettingsValueChange">
                 @foreach (var boneHeldAction in BoneActionExtensions.BoneActions)
                 {
                     <MudSelectItem Value="@boneHeldAction">@boneHeldAction</MudSelectItem>