[Scummvm-git-logs] scummvm master -> 656ae92585381c57250ddf32428024c80c21b993

sev- noreply at scummvm.org
Fri Oct 25 15:27:55 UTC 2024


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
656ae92585 Revert "COMMON: Add destructor to TextToSpeechManager. CID 1453087"


Commit: 656ae92585381c57250ddf32428024c80c21b993
    https://github.com/scummvm/scummvm/commit/656ae92585381c57250ddf32428024c80c21b993
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-25T17:27:46+02:00

Commit Message:
Revert "COMMON: Add destructor to TextToSpeechManager. CID 1453087"

This reverts commit d06a7f11684bf7ca5dbae62d83fdfc5d1eabddc2.

The destruction is happening in the backend.

Changed paths:
    common/text-to-speech.cpp
    common/text-to-speech.h


diff --git a/common/text-to-speech.cpp b/common/text-to-speech.cpp
index f654670a628..2e22b9777d6 100644
--- a/common/text-to-speech.cpp
+++ b/common/text-to-speech.cpp
@@ -86,17 +86,6 @@ TextToSpeechManager::TextToSpeechManager() {
 	_ttsState->_next = nullptr;
 }
 
-TextToSpeechManager::~TextToSpeechManager() {
-	while (_ttsState->_next != nullptr) {
-		Common::TTSState *oldState = _ttsState;
-		_ttsState = _ttsState->_next;
-
-		delete oldState;
-	}
-
-	delete _ttsState;
-}
-
 void TextToSpeechManager::pushState() {
 	stop();
 	TTSState *newState = new TTSState;
diff --git a/common/text-to-speech.h b/common/text-to-speech.h
index e520361aa0b..0a98fe667de 100644
--- a/common/text-to-speech.h
+++ b/common/text-to-speech.h
@@ -157,7 +157,7 @@ public:
 	 * pitch and volume to their middle values.
 	 */
 	TextToSpeechManager();
-	virtual ~TextToSpeechManager();
+	virtual ~TextToSpeechManager() {}
 
 	/**
 	 * Says the given string




More information about the Scummvm-git-logs mailing list