diff options
| author | clone2727 | 2014-04-17 21:06:20 -0400 |
|---|---|---|
| committer | clone2727 | 2014-04-17 21:06:20 -0400 |
| commit | d4756a961ceb31e884f3519ce0d43d40510426b5 (patch) | |
| tree | c2ad03a382aa2e4261a16c4107598ed130213dc3 | |
| parent | 444c6bd24a3b91a1b87e0a0377bd842344cadfb7 (diff) | |
| parent | 32e85a957de8142266c20271fd76aca0fa2c023c (diff) | |
| download | scummvm-rg350-d4756a961ceb31e884f3519ce0d43d40510426b5.tar.gz scummvm-rg350-d4756a961ceb31e884f3519ce0d43d40510426b5.tar.bz2 scummvm-rg350-d4756a961ceb31e884f3519ce0d43d40510426b5.zip | |
Merge pull request #460 from klusark/logically_dead
VIDEO: Use || instead of the currently incorrect &&
| -rw-r--r-- | video/flic_decoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp index 5d27aa0a59..994f47cea8 100644 --- a/video/flic_decoder.cpp +++ b/video/flic_decoder.cpp @@ -176,7 +176,7 @@ const Graphics::Surface *FlicDecoder::FlicVideoTrack::decodeNextFrame() { uint16 newWidth = _fileStream->readUint16LE(); uint16 newHeight = _fileStream->readUint16LE(); - if ((newWidth != 0) && (newHeight != 0)) { + if ((newWidth != 0) || (newHeight != 0)) { if (newWidth == 0) newWidth = _surface->w; if (newHeight == 0) |