fix ios crash on terminate(audioserverSW)

see godotengine#11623 (comment)
groscalin · Jun 5, 2018 · e7f9c48 · e7f9c48
1 parent 30a86a3
commit e7f9c48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp
@@ -371,9 +371,14 @@ void OSIPhone::delete_main_loop() {
 
 void OSIPhone::finalize() {
 
+    audio_driver->finish();
+
 	if (main_loop) // should not happen?
 		memdelete(main_loop);
 
+    audio_server->finish();
+    memdelete(audio_server);
+
 	visual_server->finish();
 	memdelete(visual_server);
 	memdelete(rasterizer);

diff --git a/servers/audio/audio_server_sw.cpp b/servers/audio/audio_server_sw.cpp
@@ -726,7 +726,8 @@ void AudioServerSW::_thread_func(void *self) {
 
 	while (!as->exit_update_thread) {
 		as->_update_streams(true);
-		OS::get_singleton()->delay_usec(5000);
+        if (OS::get_singleton())
+            OS::get_singleton()->delay_usec(5000);
 	}
 }