diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-10-20 23:55:08 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-20 23:55:08 -0300 |
| commit | f6a790d58c596773466437140f6d7e2a6a29e5e7 (patch) | |
| tree | b1b01c575e83cd77b8607771d7d745aeac75c308 /scene/audio/stream_player.cpp | |
| parent | d241b2ec1b97366791ed64f882e6e6b0e302bc9b (diff) | |
| parent | b5011d9bf1dea0e16b5b15da82f6110c4055ad09 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/audio/stream_player.cpp')
| -rw-r--r-- | scene/audio/stream_player.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp index 0ee9d76611..bffb2de4d4 100644 --- a/scene/audio/stream_player.cpp +++ b/scene/audio/stream_player.cpp @@ -165,6 +165,8 @@ void StreamPlayer::stop() { //_THREAD_SAFE_METHOD_ AudioServer::get_singleton()->stream_set_active(stream_rid,false); playback->stop(); + resampler.flush(); + //set_idle_process(false); } |