summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-01-11 20:40:47 +0100
committerGitHub <noreply@github.com>2019-01-11 20:40:47 +0100
commitb50f792a6552dc1b9914b2cd5d816f6f335a31e7 (patch)
treeab2d32a94cbe364280624c91665fea94b7d06028 /modules
parentbf799246fd73e95b510144a7deba338e88fc8e05 (diff)
parent8c1677fc3f38176ea2a986389eb1dcc511c3d100 (diff)
Merge pull request #24921 from KidRigger/pr-fix
Fixed infinite loop at end of video.
Diffstat (limited to 'modules')
-rw-r--r--modules/gdnative/videodecoder/video_stream_gdnative.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdnative/videodecoder/video_stream_gdnative.cpp b/modules/gdnative/videodecoder/video_stream_gdnative.cpp
index 8239d57a77..a1590cef43 100644
--- a/modules/gdnative/videodecoder/video_stream_gdnative.cpp
+++ b/modules/gdnative/videodecoder/video_stream_gdnative.cpp
@@ -164,7 +164,7 @@ void VideoStreamPlaybackGDNative::update(float p_delta) {
}
}
- while (interface->get_playback_position(data_struct) < time) {
+ while (interface->get_playback_position(data_struct) < time && playing) {
update_texture();
}