summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBłażej Szczygieł <spaz16@wp.pl>2016-09-28 13:39:06 +0200
committerBłażej Szczygieł <spaz16@wp.pl>2016-09-28 13:39:06 +0200
commit5585bc1c3886b37f7188b357ddcdbc76ca46f42c (patch)
tree2640d1b3d42c803c175262aa35a4a1a2796b7da0
parent73a7b91459fc18013e51e8c4dfbcc7a309d6b1e2 (diff)
Don't crash when video is stopped and played again
-rw-r--r--scene/gui/video_player.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp
index 1be847929d..335672126c 100644
--- a/scene/gui/video_player.cpp
+++ b/scene/gui/video_player.cpp
@@ -248,7 +248,7 @@ void VideoPlayer::stop() {
playback->stop();
AudioServer::get_singleton()->stream_set_active(stream_rid,false);
- resampler.clear();
+ resampler.flush();
set_process(false);
last_audio_time=0;
};
@@ -426,5 +426,6 @@ VideoPlayer::~VideoPlayer() {
if (stream_rid.is_valid())
AudioServer::get_singleton()->free(stream_rid);
+ resampler.clear(); //Not necessary here, but make in consistent with other "stream_player" classes
};