Merge branch 'mrtk_development' into vNEXT-BaseInputHandlerRaceCondition

Author: StephenHodgson

Assets/MixedRealityToolkit/_Core/Devices/VoiceInput/WindowsDictationInputDeviceManager.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Microsoft.MixedReality.Toolkit.Core.Interfaces;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
 using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
@@ -65,6 +64,8 @@ public WindowsDictationInputDeviceManager(string name, uint priority) : base(nam
         /// <inheritdoc />
         public override void Enable()
         {
+            if (!Application.isPlaying) { return; }
+
             if (InputSystem == null)
             {
                 Debug.LogWarning("Unable to start Windows Dictation Device Manager. An Input System is required for this feature.");
@@ -74,30 +75,21 @@ public override void Enable()
             inputSource = InputSystem.RequestNewGenericInputSource("Dictation Recognizer");
             dictationResult = string.Empty;
 
-            dictationRecognizer = new DictationRecognizer();
+            if (dictationRecognizer == null)
+            {
+                dictationRecognizer = new DictationRecognizer();
+            }
+
             dictationRecognizer.DictationHypothesis += DictationRecognizer_DictationHypothesis;
             dictationRecognizer.DictationResult += DictationRecognizer_DictationResult;
             dictationRecognizer.DictationComplete += DictationRecognizer_DictationComplete;
             dictationRecognizer.DictationError += DictationRecognizer_DictationError;
         }
 
-        /// <inheritdoc />
-        public override void Disable()
-        {
-            if (dictationRecognizer != null)
-            {
-                dictationRecognizer.DictationHypothesis -= DictationRecognizer_DictationHypothesis;
-                dictationRecognizer.DictationResult -= DictationRecognizer_DictationResult;
-                dictationRecognizer.DictationComplete -= DictationRecognizer_DictationComplete;
-                dictationRecognizer.DictationError -= DictationRecognizer_DictationError;
-                dictationRecognizer.Dispose();
-            }
-        }
-
         /// <inheritdoc />
         public override void Update()
         {
-            if (InputSystem == null) { return; }
+            if (!Application.isPlaying || InputSystem == null) { return; }
 
             if (!isTransitioning && IsListening && !Microphone.IsRecording(deviceName) && dictationRecognizer.Status == SpeechSystemStatus.Running)
             {
@@ -112,6 +104,28 @@ public override void Update()
             }
         }
 
+        /// <inheritdoc />
+        public override async void Disable()
+        {
+            if (Application.isPlaying && dictationRecognizer != null)
+            {
+                if (!isTransitioning && IsListening) { await StopRecordingAsync(); }
+
+                dictationRecognizer.DictationHypothesis -= DictationRecognizer_DictationHypothesis;
+                dictationRecognizer.DictationResult -= DictationRecognizer_DictationResult;
+                dictationRecognizer.DictationComplete -= DictationRecognizer_DictationComplete;
+                dictationRecognizer.DictationError -= DictationRecognizer_DictationError;
+            }
+        }
+
+        public override void Destroy()
+        {
+            if (Application.isPlaying)
+            {
+                dictationRecognizer?.Dispose();
+            }
+        }
+
         /// <inheritdoc />
         public async void StartRecording(GameObject listener, float initialSilenceTimeout = 5, float autoSilenceTimeout = 20, int recordingTime = 10, string micDeviceName = "")
         {