TTS: Minimize the time needed for stop() on Win32

This gets rid of freezes when using TTS on Windows.

1 files changed, 4 insertions, 6 deletions

diff --git a/backends/text-to-speech/windows/windows-text-to-speech.cpp b/backends/text-to-speech/windows/windows-text-to-speech.cpp
index a59f21952b..ceca3e4566 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.cpp
+++ b/backends/text-to-speech/windows/windows-text-to-speech.cpp
@@ -231,18 +231,16 @@ bool WindowsTextToSpeechManager::stop() {
 		resume();
 	_audio->SetState(SPAS_STOP, 0);
 	WaitForSingleObject(_speechMutex, INFINITE);
+	// Delete the speech queue
 	while (!_speechQueue.empty()) {
 		if (_speechQueue.front() != NULL)
 			free(_speechQueue.front());
 		_speechQueue.pop_front();
 	}
-	_speechQueue.push_back(NULL);
+	// Stop the current speech
+	_voice->Speak(NULL, SPF_PURGEBEFORESPEAK | SPF_ASYNC, 0);
+	_speechState = READY;
 	ReleaseMutex(_speechMutex);
-	if (_thread != NULL) {
-		WaitForSingleObject(_thread, INFINITE);
-		CloseHandle(_thread);
-		_thread = NULL;
-	}
 	_audio->SetState(SPAS_RUN, 0);
 	return false;
 }