BADA: Allow clean shutdown when encountering an error

2 files changed, 7 insertions, 5 deletions

diff --git a/backends/platform/bada/form.cpp b/backends/platform/bada/form.cpp
index d5fda598ee..f75acfed20 100755
--- a/backends/platform/bada/form.cpp
+++ b/backends/platform/bada/form.cpp
@@ -99,7 +99,7 @@ result BadaAppForm::Construct() {
 BadaAppForm::~BadaAppForm() {

 	logEntered();

 

-	if (_gameThread) {

+	if (_gameThread && _state != ErrorState) {

 		terminate();

 		_gameThread->Stop();

 		_gameThread->Join();

diff --git a/backends/platform/bada/system.cpp b/backends/platform/bada/system.cpp
index f3f3083e5a..9cc7f450fe 100755
--- a/backends/platform/bada/system.cpp
+++ b/backends/platform/bada/system.cpp
@@ -361,8 +361,6 @@ void BadaSystem::destroyBackend() {
 

 	delete _mutexManager;

 	_mutexManager = 0;

-

-	delete g_engine;

 }

 

 bool BadaSystem::pollEvent(Common::Event &event) {

@@ -413,8 +411,12 @@ void BadaSystem::exitSystem() {
 	}

 }

 

-void BadaSystem::logMessage(LogMessageType::Type /*type*/, const char *message) {

-	AppLog(message);

+void BadaSystem::logMessage(LogMessageType::Type type, const char *message) {

+	if (type == LogMessageType::kError) {

+		systemError(message);

+	}	else {

+		AppLog(message);

+	}

 }

 

 Common::SeekableReadStream *BadaSystem::createConfigReadStream() {