[Scummvm-cvs-logs] scummvm master -> a5b97a989cc117799706a0c82bc686f79d6eda9f
sev-
sev at scummvm.org
Thu Aug 25 10:22:21 CEST 2016
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:
a5b97a989c DIRECTOR: Fix numerous crashes on destruction
Commit: a5b97a989cc117799706a0c82bc686f79d6eda9f
https://github.com/scummvm/scummvm/commit/a5b97a989cc117799706a0c82bc686f79d6eda9f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-25T10:22:20+02:00
Commit Message:
DIRECTOR: Fix numerous crashes on destruction
Changed paths:
engines/director/director.cpp
engines/director/score.cpp
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 4e2973b..89bac29 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -73,14 +73,12 @@ DirectorEngine::~DirectorEngine() {
delete _sharedBMP;
delete _sharedSTXT;
delete _sharedDIB;
- delete _movies;
+ delete _currentScore;
delete _mainArchive;
delete _macBinary;
delete _soundManager;
delete _lingo;
- delete _currentScore;
- delete _currentPalette;
}
Common::Error DirectorEngine::run() {
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 2448ab0..c4294fd 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -97,6 +97,7 @@ Score::Score(DirectorEngine *vm) {
_lingo->processEvent(kEventPrepareMovie, 0);
_movieScriptCount = 0;
_labels = NULL;
+ _font = NULL;
if (_movieArchive->hasResource(MKTAG('M','C','N','M'), 0)) {
_macName = _movieArchive->getName(MKTAG('M','C','N','M'), 0).c_str();
@@ -181,8 +182,6 @@ Score::~Score() {
_movieArchive->close();
delete _font;
- delete _movieArchive;
-
delete _labels;
}
More information about the Scummvm-git-logs
mailing list