Merge pull request #1895 from borigas/TextToSpeechCancelHang

Fixes hang waiting for cancelled TextToSpeech
xamarin · Jan 18, 2022 · 2627bf2 · 2627bf2
2 parents 20d627e + 8b83bf9
commit 2627bf2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Xamarin.Essentials/TextToSpeech/TextToSpeech.android.cs b/Xamarin.Essentials/TextToSpeech/TextToSpeech.android.cs
@@ -109,6 +109,8 @@ public async Task SpeakAsync(string text, int max, SpeechOptions options, Cancel
             if (tcsUtterances?.Task != null)
                 await tcsUtterances.Task;
 
+            tcsUtterances = new TaskCompletionSource<bool>();
+
             if (cancelToken != null)
             {
                 cancelToken.Register(() =>
@@ -150,7 +152,6 @@ public async Task SpeakAsync(string text, int max, SpeechOptions options, Cancel
             var parts = text.SplitSpeak(max);
 
             numExpectedUtterances = parts.Count;
-            tcsUtterances = new TaskCompletionSource<bool>();
 
             var guid = Guid.NewGuid().ToString();