Merge pull request ExtendRealityLtd#1536 from thestonefox/fix/interac…

…t-override-buttons fix(Interaction): ensure override buttons are reset correctly - fixes ExtendRealityLtd#1535
metrowave · Oct 4, 2017 · e16de5a · e16de5a
2 parents 236051c + 5c21268
commit e16de5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/Assets/VRTK/Scripts/Interactions/VRTK_InteractGrab.cs b/Assets/VRTK/Scripts/Interactions/VRTK_InteractGrab.cs
@@ -262,6 +262,7 @@ protected virtual void ControllerTouchInteractableObject(object sender, ObjectIn
                 {
                     savedGrabButton = subscribedGrabButton;
                     grabButton = touchedObjectScript.grabOverrideButton;
+                    ManageGrabListener(true);
                 }
             }
         }
@@ -275,6 +276,7 @@ protected virtual void ControllerUntouchInteractableObject(object sender, Object
                 {
                     grabButton = savedGrabButton;
                     savedGrabButton = VRTK_ControllerEvents.ButtonAlias.Undefined;
+                    ManageGrabListener(true);
                 }
             }
         }

diff --git a/Assets/VRTK/Scripts/Interactions/VRTK_InteractUse.cs b/Assets/VRTK/Scripts/Interactions/VRTK_InteractUse.cs
@@ -223,6 +223,7 @@ protected virtual void ControllerTouchInteractableObject(object sender, ObjectIn
                 {
                     savedUseButton = subscribedUseButton;
                     useButton = touchedObjectScript.useOverrideButton;
+                    ManageUseListener(true);
                 }
             }
         }
@@ -236,6 +237,7 @@ protected virtual void ControllerUntouchInteractableObject(object sender, Object
                 {
                     useButton = savedUseButton;
                     savedUseButton = VRTK_ControllerEvents.ButtonAlias.Undefined;
+                    ManageUseListener(true);
                 }
             }
         }