[Scummvm-git-logs] scummvm master -> b8d416822bc99d37244566ea702980433a46c9d1

sev- noreply at scummvm.org
Tue Jun 21 23:05:21 UTC 2022


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:
b8d416822b DIRECTOR: Fix crash when movie has no shared cast


Commit: b8d416822bc99d37244566ea702980433a46c9d1
    https://github.com/scummvm/scummvm/commit/b8d416822bc99d37244566ea702980433a46c9d1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-22T01:04:52+02:00

Commit Message:
DIRECTOR: Fix crash when movie has no shared cast

Changed paths:
    engines/director/movie.cpp


diff --git a/engines/director/movie.cpp b/engines/director/movie.cpp
index 8a614dd7727..b1280de7ab0 100644
--- a/engines/director/movie.cpp
+++ b/engines/director/movie.cpp
@@ -95,7 +95,8 @@ Movie::~Movie() {
 	// _movieArchive is shared with the cast, so the cast will free it
 	delete _cast;
 
-	g_director->_openResFiles.erase(_sharedCast->getArchive()->getPathName());
+	if (_sharedCast)
+		g_director->_openResFiles.erase(_sharedCast->getArchive()->getPathName());
 
 	delete _sharedCast;
 	delete _score;




More information about the Scummvm-git-logs mailing list