aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2016-07-22 13:00:41 -0500
committerColin Snover2016-07-24 12:07:04 -0500
commit32531ac16a579072d635f71517acccb91506b378 (patch)
tree8d7d5e94c5e8a2a527bbd2cab81f9cc24c6c7e7e
parent1c228c488e765fc3e0e19dbcc91b3c40d4712697 (diff)
downloadscummvm-rg350-32531ac16a579072d635f71517acccb91506b378.tar.gz
scummvm-rg350-32531ac16a579072d635f71517acccb91506b378.tar.bz2
scummvm-rg350-32531ac16a579072d635f71517acccb91506b378.zip
SCI32: Fix Video32 breaking when quitting during video playback
-rw-r--r--engines/sci/sci.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index f9481bb301..3ea2756f56 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;