From 3180827387f3a0f240f911227fd42d93bb4c9b13 Mon Sep 17 00:00:00 2001
From: Marcelo Fernandez
Date: Tue, 1 Aug 2017 18:09:52 -0300
Subject: Fix AudioServer::finish not getting called while quitting

---
 servers/audio_server.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'servers/audio_server.cpp')

diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index 5303aea6d..0d2550e53 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 {
-- 
cgit v1.2.3-70-g09d2