diff options
| author | Saracen | 2015-10-31 08:59:29 +0000 |
|---|---|---|
| committer | Saracen | 2015-11-02 16:36:41 +0000 |
| commit | e723488aa3933ec0e56b8e09e44256f6dc5da344 (patch) | |
| tree | 282dd4f4223cc0a00b76aff8f70955abd90c6c36 /platform | |
| parent | b2f9acb8c96aed0505cbac21661e21e4acef710f (diff) | |
| download | godot-e723488aa3933ec0e56b8e09e44256f6dc5da344.tar.gz godot-e723488aa3933ec0e56b8e09e44256f6dc5da344.tar.zst godot-e723488aa3933ec0e56b8e09e44256f6dc5da344.zip | |
Moved deleting sample player in OS finalize methods to before deleting audio server to prevent crash when exiting.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/bb10/os_bb10.cpp | 3 | ||||
| -rw-r--r-- | platform/haiku/os_haiku.cpp | 3 | ||||
| -rw-r--r-- | platform/server/os_server.cpp | 3 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 3 | ||||
| -rw-r--r-- | platform/winrt/os_winrt.cpp | 3 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/platform/bb10/os_bb10.cpp b/platform/bb10/os_bb10.cpp index d89033b1d..c8e7ae561 100644 --- a/platform/bb10/os_bb10.cpp +++ b/platform/bb10/os_bb10.cpp @@ -195,9 +195,10 @@ void OSBB10::finalize() { // memdelete(debugger_connection_console); //} + memdelete(sample_manager); + audio_server->finish(); memdelete(audio_server); - memdelete(sample_manager); visual_server->finish(); memdelete(visual_server); diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp index 1edb23d50..ef483657c 100644 --- a/platform/haiku/os_haiku.cpp +++ b/platform/haiku/os_haiku.cpp @@ -137,9 +137,10 @@ void OS_Haiku::finalize() { spatial_sound_2d_server->finish(); memdelete(spatial_sound_2d_server); + memdelete(sample_manager); + audio_server->finish(); memdelete(audio_server); - memdelete(sample_manager); visual_server->finish(); memdelete(visual_server); diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index 75e0878ba..8b831140d 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -107,9 +107,10 @@ void OS_Server::finalize() { // memdelete(debugger_connection_console); //} + memdelete(sample_manager); + audio_server->finish(); memdelete(audio_server); - memdelete(sample_manager); visual_server->finish(); memdelete(visual_server); diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 438a5a690..c6dae8622 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1373,9 +1373,10 @@ void OS_Windows::finalize() { // memdelete(debugger_connection_console); //} + memdelete(sample_manager); + audio_server->finish(); memdelete(audio_server); - memdelete(sample_manager); memdelete(input); diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp index 3e06d9d59..02de26250 100644 --- a/platform/winrt/os_winrt.cpp +++ b/platform/winrt/os_winrt.cpp @@ -326,10 +326,11 @@ void OSWinrt::finalize() { //if (debugger_connection_console) { // memdelete(debugger_connection_console); //} + + memdelete(sample_manager); audio_server->finish(); memdelete(audio_server); - memdelete(sample_manager); memdelete(input); diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 34bd1184a..3218230d0 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -452,9 +452,10 @@ void OS_X11::finalize() { // memdelete(debugger_connection_console); //} + memdelete(sample_manager); + audio_server->finish(); memdelete(audio_server); - memdelete(sample_manager); visual_server->finish(); memdelete(visual_server); |