asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

X11: Move audio driver finalize to the start of cleanup

Browse source 
The audio driver cleanup needs to happen at the start of finish
otherwise a race still seems to exist with the destruction of the
audioserver. I think that destroying the X resoures before has something
to do with it.
This commit is contained in:
Hein-Pieter van Braam 2017-02-17 17:59:06 +01:00
parent b96c7ace2d
commit f70afbe129
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/x11/os_x11.cpp
View file

@ -464,6 +464,10 @@ void OS_X11::finalize() {
memdelete(main_loop); memdelete(main_loop);
main_loop=NULL; main_loop=NULL;
for (int i = 0; i < get_audio_driver_count(); i++) {
AudioDriverManager::get_driver(i)->finish();
}
/* /*
if (debugger_connection_console) { if (debugger_connection_console) {
memdelete(debugger_connection_console); memdelete(debugger_connection_console);
@ -475,7 +479,6 @@ void OS_X11::finalize() {
#endif #endif
memdelete(input); memdelete(input);
visual_server->finish(); visual_server->finish();
memdelete(visual_server); memdelete(visual_server);
//memdelete(rasterizer); //memdelete(rasterizer);
@ -512,9 +515,6 @@ void OS_X11::finalize() {
args.clear(); args.clear();
for (int i = 0; i < get_audio_driver_count(); i++) {
AudioDriverManager::get_driver(i)->finish();
}
} }