diff options
| author | Paul Gilbert | 2017-07-31 22:39:28 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-07-31 22:39:28 -0400 |
| commit | 62ab06645788ef5b99264033382001245648fbbe (patch) | |
| tree | db2f8ecea958fa03037d555c0fd8479841512074 /engines/titanic | |
| parent | a590b8bf0a6750e0051995fe71823dac67f104fd (diff) | |
| download | scummvm-rg350-62ab06645788ef5b99264033382001245648fbbe.tar.gz scummvm-rg350-62ab06645788ef5b99264033382001245648fbbe.tar.bz2 scummvm-rg350-62ab06645788ef5b99264033382001245648fbbe.zip | |
TITANIC: Fix not being able to close ScummVM during prologue credits
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/support/avi_surface.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp index 86daeab344..7673c37c37 100644 --- a/engines/titanic/support/avi_surface.cpp +++ b/engines/titanic/support/avi_surface.cpp @@ -472,7 +472,8 @@ Graphics::ManagedSurface *AVISurface::duplicateTransparency() const { } bool AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) { - bool isDifferent = false; + if (g_vm->shouldQuit()) + return false; if (_currentFrame != ((int)startFrame - 1) || startFrame == 0) { // Start video playback at the desired starting frame @@ -484,7 +485,7 @@ bool AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) { _decoder->start(); } - isDifferent = _movieFrameSurface[0]->w != r.width() || + bool isDifferent = _movieFrameSurface[0]->w != r.width() || _movieFrameSurface[0]->h != r.height(); bool isFinished = true; @@ -515,7 +516,7 @@ bool AVISurface::playCutscene(const Rect &r, uint startFrame, uint endFrame) { } stop(); - return isFinished; + return isFinished && !g_vm->shouldQuit(); } uint AVISurface::getBitDepth() const { |