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

X11: Move audio driver finalize to the start of cleanup
This commit is contained in:
Rémi Verschelde 2017-02-17 18:21:12 +01:00 committed by GitHub
commit 9a5442a226
1 changed files with 4 additions and 4 deletions

View File

@ -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();
}
}