diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-02 00:16:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 00:16:33 +0200 |
| commit | ee3530bdc29c5015f276e3c44a68fbf4db5daf6e (patch) | |
| tree | 6ce05b14e3e8d64ba5cb760cee795fff9cca93e8 /servers/audio_server.cpp | |
| parent | 6dd1cdc9dbc0fbcdc0a1484906f4ef25610c4c20 (diff) | |
| parent | 3180827387f3a0f240f911227fd42d93bb4c9b13 (diff) | |
Merge pull request #10028 from marcelofg55/audioserver_finish
Fix AudioServer::finish not getting called while quitting
Diffstat (limited to 'servers/audio_server.cpp')
| -rw-r--r-- | servers/audio_server.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 5303aea6d0..0d2550e53b 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -66,7 +66,8 @@ void AudioDriver::audio_server_process(int p_frames, int32_t *p_buffer, bool p_u void AudioDriver::update_mix_time(int p_frames) { _mix_amount += p_frames; - _last_mix_time = OS::get_singleton()->get_ticks_usec(); + if (OS::get_singleton()) + _last_mix_time = OS::get_singleton()->get_ticks_usec(); } double AudioDriver::get_mix_time() const { |