libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 19:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Fix another crash on exit

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-07-02 21:17:06 +02:00
parent 4b9b1f3c2d
commit 36d7addda9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engines/director/score.cpp
View File

@ -54,6 +54,7 @@ Score::Score(DirectorEngine *vm) {
_soundManager = _vm->getSoundManager();
_lingo->processEvent(kEventPrepareMovie, 0);
_movieScriptCount = 0;
_labels = NULL;
if (_movieArchive->hasResource(MKTAG('M','C','N','M'), 0)) {
_macName = _movieArchive->getName(MKTAG('M','C','N','M'), 0).c_str();
@ -122,13 +123,17 @@ void Score::loadArchive() {
}
Score::~Score() {
_surface->free();
_trailSurface->free();
if (_surface)
_surface->free();
if (_trailSurface)
_trailSurface->free();
delete _surface;
delete _trailSurface;
_movieArchive->close();
if (_movieArchive)
_movieArchive->close();
delete _surface;
delete _trailSurface;
@ -136,12 +141,7 @@ Score::~Score() {
delete _font;
delete _movieArchive;
delete[] _labels;
delete[] &_frames;
delete[] &_casts;
delete[] &_castsInfo;
delete[] &_actions;
delete[] &_fontMap;
delete _labels;
}
void Score::loadPalette(Common::SeekableSubReadStreamEndian &stream) {