From 382ba52e332a02a49343c1ba1c2aed80dfcd5c87 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 23 Jul 2016 12:45:29 -0400 Subject: TITANIC: Fix exit crash when a movie is active --- engines/titanic/support/movie.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp index 9dc57b897a..33e7d33154 100644 --- a/engines/titanic/support/movie.cpp +++ b/engines/titanic/support/movie.cpp @@ -50,6 +50,15 @@ void CMovie::init() { } void CMovie::deinit() { + // Delete each movie in turn + for (CMovieList::iterator i = _playingMovies->begin(); i != _playingMovies->end(); ) { + // We need to increment iterator before deleting movie, + // since the CMovie destructor calls removeFromPlayingMovies + CMovie *movie = *i; + ++i; + delete movie; + } + delete _playingMovies; delete _movieSurface; } -- cgit v1.2.3