From 399b1b047498d154440f5cda4a5ceb08ea3de68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 1 Nov 2015 20:53:26 +0100 Subject: Cosmetic fixes to SCons buildsystem - Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check --- platform/bb10/SCsub | 1 - 1 file changed, 1 deletion(-) (limited to 'platform/bb10') diff --git a/platform/bb10/SCsub b/platform/bb10/SCsub index 24f2b5d242..81f6e726e4 100644 --- a/platform/bb10/SCsub +++ b/platform/bb10/SCsub @@ -19,4 +19,3 @@ if env['bb10_lgles_override'] == "yes": prog = None prog = env_bps.Program('#bin/godot', bb10_lib) - -- cgit v1.2.3 From e723488aa3933ec0e56b8e09e44256f6dc5da344 Mon Sep 17 00:00:00 2001 From: Saracen Date: Sat, 31 Oct 2015 08:59:29 +0000 Subject: Moved deleting sample player in OS finalize methods to before deleting audio server to prevent crash when exiting. --- platform/bb10/os_bb10.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'platform/bb10') diff --git a/platform/bb10/os_bb10.cpp b/platform/bb10/os_bb10.cpp index d89033b1df..c8e7ae561e 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); -- cgit v1.2.3