Merge branch 'HTK-master' into HTK-local

Author: Stephen Hodgson

Assets/HoloToolkit/Input/Scripts/InputManager.cs

@@ -331,7 +331,7 @@ private void UnregisterGazeManager()
             }
         }
 
-        private static readonly ExecuteEvents.EventFunction<IFocusable> OnFocusEnterEventHadler =
+        private static readonly ExecuteEvents.EventFunction<IFocusable> OnFocusEnterEventHandler =
             delegate (IFocusable handler, BaseEventData eventData)
             {
                 handler.OnFocusEnter();
@@ -352,7 +352,7 @@ private void GazeManager_FocusedChanged(GameObject previousObject, GameObject ne
 
             if (previousObject != null)
             {
-                ExecuteEvents.ExecuteHierarchy(previousObject, null, OnFocusEnterEventHadler);
+                ExecuteEvents.ExecuteHierarchy(previousObject, null, OnFocusExitEventHandler);
                 if (ShouldSendUnityUiEvents)
                 {
                     ExecuteEvents.ExecuteHierarchy(previousObject, GazeManager.Instance.UnityUIPointerEvent, ExecuteEvents.pointerExitHandler);
@@ -361,7 +361,7 @@ private void GazeManager_FocusedChanged(GameObject previousObject, GameObject ne
 
             if (newObject != null)
             {
-                ExecuteEvents.ExecuteHierarchy(newObject, null, OnFocusExitEventHandler);
+                ExecuteEvents.ExecuteHierarchy(newObject, null, OnFocusEnterEventHandler);
                 if (ShouldSendUnityUiEvents)
                 {
                     ExecuteEvents.ExecuteHierarchy(newObject, GazeManager.Instance.UnityUIPointerEvent, ExecuteEvents.pointerEnterHandler);

Assets/HoloToolkit/Input/Scripts/Voice/KeywordManager.cs

@@ -71,7 +71,10 @@ void Start()
 
         void Update()
         {
-            ProcessKeyBindings();
+            if (keywordRecognizer.IsRunning)
+            {
+                ProcessKeyBindings();
+            }
         }
 
         void OnDestroy()