Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #10028 from marcelofg55/audioserver_finish

Fix AudioServer::finish not getting called while quitting
Rémi Verschelde 8 years ago
parent
6dd1cdc9db 3180827387
commit
ee3530bdc2
2 changed files with 3 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 0
      main/main.cpp
  2. 2 1
      servers/audio_server.cpp

+ 1 - 0
main/main.cpp
View File 

@@ -1704,6 +1704,7 @@ void Main::cleanup() {
 
 #endif
 
 #endif
 
 
 
 	if (audio_server) {
 
 	if (audio_server) {
 
+		audio_server->finish();
 
 		memdelete(audio_server);
 
 		memdelete(audio_server);
 
 	}
 
 	}

+ 2 - 1
servers/audio_server.cpp
View File 

@@ -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) {
 
 void AudioDriver::update_mix_time(int p_frames) {
 
 
 
 	_mix_amount += 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 {
 
 double AudioDriver::get_mix_time() const {