diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-23 23:44:07 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-23 23:44:07 +0300 |
| commit | 4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a (patch) | |
| tree | b476b0f4aa8df1801361a04390c98cf0e2e3d98b /drivers/mpc/audio_stream_mpc.cpp | |
| parent | ff755f93eb86e3f7f6801918457ca77a3001671b (diff) | |
| parent | 530d717a67cc3acab10270dca700db328aa12891 (diff) | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
drivers/SCsub
platform/x11/detect.py
platform/x11/os_x11.h
Diffstat (limited to 'drivers/mpc/audio_stream_mpc.cpp')
| -rw-r--r-- | drivers/mpc/audio_stream_mpc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mpc/audio_stream_mpc.cpp b/drivers/mpc/audio_stream_mpc.cpp index e1f9aacf5f..d94f57e683 100644 --- a/drivers/mpc/audio_stream_mpc.cpp +++ b/drivers/mpc/audio_stream_mpc.cpp @@ -275,7 +275,7 @@ void AudioStreamMPC::stop() { } bool AudioStreamMPC::is_playing() const { - return active; + return active || (get_total() - get_todo() -1 > 0); } void AudioStreamMPC::set_paused(bool p_paused) { |