diff options
| author | Błażej Szczygieł | 2016-09-28 13:39:06 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-10-09 17:22:54 +0200 |
| commit | d6139523005d303d468f8e903f4b444ae5053ab6 (patch) | |
| tree | 57f4017c112c3cc40b58a6bc5992bd3e437cfffc | |
| parent | a3c58999e259a1d4dca0d2c1ca9134eced336119 (diff) | |
| download | godot-d6139523005d303d468f8e903f4b444ae5053ab6.tar.gz godot-d6139523005d303d468f8e903f4b444ae5053ab6.tar.zst godot-d6139523005d303d468f8e903f4b444ae5053ab6.zip | |
Don't crash when video is stopped and played again
(cherry picked from commit 5585bc1c3886b37f7188b357ddcdbc76ca46f42c)
Diffstat (limited to '')
| -rw-r--r-- | scene/gui/video_player.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp index 1be847929..335672126 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 }; |