Merge pull request #7833 from hpvb/x11-move-audio-drive-finalize

X11: Move audio driver finalize to the start of cleanup
godotengine · Feb 17, 2017 · 9a5442a · 9a5442a
2 parents b96c7ac + f70afbe
commit 9a5442a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
@@ -464,6 +464,10 @@ void OS_X11::finalize() {
 		memdelete(main_loop);
 	main_loop=NULL;
 
+	for (int i = 0; i < get_audio_driver_count(); i++) {
+		AudioDriverManager::get_driver(i)->finish();
+	}
+
 	/*
 	if (debugger_connection_console) {
 		memdelete(debugger_connection_console);
@@ -475,7 +479,6 @@ void OS_X11::finalize() {
 #endif
 	memdelete(input);
 
-
 	visual_server->finish();
 	memdelete(visual_server);
 	//memdelete(rasterizer);
@@ -512,9 +515,6 @@ void OS_X11::finalize() {
 
 	args.clear();
 
-	for (int i = 0; i < get_audio_driver_count(); i++) {
-		AudioDriverManager::get_driver(i)->finish();
-	}
 }