[Scummvm-git-logs] scummvm master -> 8f79e5ee6c3cf94ab28f54ccd5887668a8af3fe4

mistydemeo noreply at scummvm.org
Sun Jan 15 22:43:58 UTC 2023


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:
8f79e5ee6c DIRECTOR: CAST: remove reference check


Commit: 8f79e5ee6c3cf94ab28f54ccd5887668a8af3fe4
    https://github.com/scummvm/scummvm/commit/8f79e5ee6c3cf94ab28f54ccd5887668a8af3fe4
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-01-15T14:43:50-08:00

Commit Message:
DIRECTOR: CAST: remove reference check

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index bfccb441b1b..65ea9d08dc7 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -91,9 +91,7 @@ Cast::~Cast() {
 		for (Common::HashMap<int, const Stxt *>::iterator it = _loadedStxts->begin(); it != _loadedStxts->end(); ++it)
 			delete it->_value;
 
-	// There may be another open reference to the same file, in which
-	// case attempting to free it now would be dangerous.
-	if (_castArchive && !g_director->_allOpenResFiles.contains(_castArchive->getPathName())) {
+	if (_castArchive) {
 		_castArchive->close();
 		delete _castArchive;
 		_castArchive = nullptr;




More information about the Scummvm-git-logs mailing list