[Scummvm-cvs-logs] scummvm master -> 32531ac16a579072d635f71517acccb91506b378
csnover
csnover at users.noreply.github.com
Sun Jul 24 19:08:01 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:
32531ac16a SCI32: Fix Video32 breaking when quitting during video playback
Commit: 32531ac16a579072d635f71517acccb91506b378
https://github.com/scummvm/scummvm/commit/32531ac16a579072d635f71517acccb91506b378
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-07-24T12:07:04-05:00
Commit Message:
SCI32: Fix Video32 breaking when quitting during video playback
Changed paths:
engines/sci/sci.cpp
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index f9481bb..3ea2756 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -167,11 +167,15 @@ SciEngine::~SciEngine() {
DebugMan.clearAllDebugChannels();
#ifdef ENABLE_SCI32
- delete _gfxPalette32;
delete _gfxControls32;
delete _gfxPaint32;
delete _gfxText32;
delete _robotDecoder;
+ // GfxFrameout and GfxPalette32 must be deleted after Video32 since
+ // destruction of screen items in the Video32 destructor relies on these
+ // components
+ delete _video32;
+ delete _gfxPalette32;
delete _gfxFrameout;
delete _gfxRemap32;
delete _audio32;
More information about the Scummvm-git-logs
mailing list