aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2011-01-20 17:06:50 +0000
committerSven Hesse2011-01-20 17:06:50 +0000
commit715560edb9e369fe5e55567d3725e853b11e3e91 (patch)
treec7e1f2332d479107b16d392c0d8eb88f3f6f8529
parentadf8820aee35ce2fa38b5420aab50461653f705f (diff)
downloadscummvm-rg350-715560edb9e369fe5e55567d3725e853b11e3e91.tar.gz
scummvm-rg350-715560edb9e369fe5e55567d3725e853b11e3e91.tar.bz2
scummvm-rg350-715560edb9e369fe5e55567d3725e853b11e3e91.zip
GOB: Don't temper with the break key for live videos
svn-id: r55355
-rw-r--r--engines/gob/videoplayer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index 2c779b512d..6151bafa35 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -231,9 +231,6 @@ bool VideoPlayer::play(int slot, Properties &properties) {
bool primary = slot == 0;
- // NOTE: For testing (and comfort?) purposes, we enable aborting of all videos)
- properties.breakKey = kShortKeyEscape;
-
if (properties.startFrame < 0)
properties.startFrame = video->decoder->getCurFrame() + 1;
if (properties.lastFrame < 0)
@@ -266,6 +263,9 @@ bool VideoPlayer::play(int slot, Properties &properties) {
return true;
}
+ // NOTE: For testing (and comfort?) purposes, we enable aborting of all videos)
+ properties.breakKey = kShortKeyEscape;
+
while ((properties.startFrame != properties.lastFrame) &&
(properties.startFrame < (int32)(video->decoder->getFrameCount() - 1))) {