diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-10 09:13:49 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-10 13:26:37 +0200 |
commit | 386768298cf2be024de673f5329c94a23dab4b90 (patch) | |
tree | 9c130cd93f984788493c427098358a8da86628e3 /src/gui/image/qmovie.cpp | |
parent | ae7b21898273a83b4b2669b9d30a7f9777a7af99 (diff) | |
parent | 9c84b7786cac7ea1cf1a8a61b503fca4b5553a49 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/gui/image/qmovie.cpp')
-rw-r--r-- | src/gui/image/qmovie.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index 3e975115ab..25fce050a1 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -414,7 +414,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber) } else { // We've read all frames now. Return an end marker haveReadAll = true; - return QFrameInfo::endMarker(); + return frameNumber == greatestFrameNumber + 1 ? QFrameInfo::endMarker() : QFrameInfo(); } } } |