godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved deleting sample player in OS finalize methods to before deleting audio server to prevent crash when exiting.

Browse Source
This commit is contained in:
Saracen 2015-10-31 08:59:29 +00:00
parent b2f9acb8c9
commit e723488aa3
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/bb10/os_bb10.cpp
View File

@ -195,9 +195,10 @@ void OSBB10::finalize() {
// memdelete(debugger_connection_console); // memdelete(debugger_connection_console);
//} //}
memdelete(sample_manager);
audio_server->finish(); audio_server->finish();
memdelete(audio_server); memdelete(audio_server);
memdelete(sample_manager);
visual_server->finish(); visual_server->finish();
memdelete(visual_server); memdelete(visual_server);

3
platform/haiku/os_haiku.cpp
View File

@ -137,9 +137,10 @@ void OS_Haiku::finalize() {
spatial_sound_2d_server->finish(); spatial_sound_2d_server->finish();
memdelete(spatial_sound_2d_server); memdelete(spatial_sound_2d_server);
memdelete(sample_manager);
audio_server->finish(); audio_server->finish();
memdelete(audio_server); memdelete(audio_server);
memdelete(sample_manager);
visual_server->finish(); visual_server->finish();
memdelete(visual_server); memdelete(visual_server);

3
platform/server/os_server.cpp
View File

@ -107,9 +107,10 @@ void OS_Server::finalize() {
// memdelete(debugger_connection_console); // memdelete(debugger_connection_console);
//} //}
memdelete(sample_manager);
audio_server->finish(); audio_server->finish();
memdelete(audio_server); memdelete(audio_server);
memdelete(sample_manager);
visual_server->finish(); visual_server->finish();
memdelete(visual_server); memdelete(visual_server);

3
platform/windows/os_windows.cpp
View File

@ -1373,9 +1373,10 @@ void OS_Windows::finalize() {
// memdelete(debugger_connection_console); // memdelete(debugger_connection_console);
//} //}
memdelete(sample_manager);
audio_server->finish(); audio_server->finish();
memdelete(audio_server); memdelete(audio_server);
memdelete(sample_manager);
memdelete(input); memdelete(input);

3
platform/winrt/os_winrt.cpp
View File

@ -326,10 +326,11 @@ void OSWinrt::finalize() {
//if (debugger_connection_console) { //if (debugger_connection_console) {
// memdelete(debugger_connection_console); // memdelete(debugger_connection_console);
//} //}
memdelete(sample_manager);
audio_server->finish(); audio_server->finish();
memdelete(audio_server); memdelete(audio_server);
memdelete(sample_manager);
memdelete(input); memdelete(input);

3
platform/x11/os_x11.cpp
View File

@ -452,9 +452,10 @@ void OS_X11::finalize() {
// memdelete(debugger_connection_console); // memdelete(debugger_connection_console);
//} //}
memdelete(sample_manager);
audio_server->finish(); audio_server->finish();
memdelete(audio_server); memdelete(audio_server);
memdelete(sample_manager);
visual_server->finish(); visual_server->finish();
memdelete(visual_server); memdelete(visual_server);