Merge pull request #2210 from LocalJoost/Keyboard_dication_input_fixes

Keyboard dication input fixes

Author: David Kline

Assets/HoloToolkit/Input/Scripts/InputSources/DictationInputManager.cs

@@ -101,6 +101,7 @@ protected override void OnDestroy()
 
         #endregion // Unity Methods
 
+
         /// <summary>
         /// Turns on the dictation recognizer and begins recording audio from the default microphone.
         /// </summary>
@@ -167,6 +168,14 @@ public static IEnumerator StartRecording(GameObject listener = null, float initi
         /// </summary>
         public static IEnumerator StopRecording()
         {
+            yield return Instance.StopRecordingInternal();
+        }
+
+        /// <summary>
+        /// Ends the recording session.
+        /// </summary>
+        private IEnumerator StopRecordingInternal()
+        {
 #if UNITY_WSA || UNITY_STANDALONE_WIN
             if (!IsListening || isTransitioning)
             {
@@ -190,16 +199,21 @@ public static IEnumerator StopRecording()
                 dictationRecognizer.Stop();
             }
 
+            StartCoroutine(FinishStopRecording());
+#else
+            return null;
+#endif
+        }
+
+        private IEnumerator FinishStopRecording()
+        {
             while (dictationRecognizer.Status == SpeechSystemStatus.Running)
             {
                 yield return null;
             }
 
             PhraseRecognitionSystem.Restart();
             isTransitioning = false;
-#else
-            return null;
-#endif
         }
 
         #region Dictation Recognizer Callbacks

Assets/HoloToolkit/UX/Scripts/Keyboard.cs

@@ -326,6 +326,10 @@ public void OnDictationHypothesis(DictationEventData eventData)
         /// <param name="eventData">Dictation event data</param>
         public void OnDictationResult(DictationEventData eventData)
         {
+            if (eventData.used)
+            {
+                return;
+            }
             var text = eventData.DictationResult;
             ResetClosingTime();
             if (text != null)
@@ -336,6 +340,7 @@ public void OnDictationResult(DictationEventData eventData)
                 m_CaretPosition += text.Length;
 
                 UpdateCaretPosition(m_CaretPosition);
+                eventData.Use();
             }
         }