From 46a8304b730e35dee340ac2ab665725f8f7f78b5 Mon Sep 17 00:00:00 2001
From: Chris Warren-Smith
Date: Sat, 13 Aug 2011 07:35:50 +1000
Subject: BADA: Allow clean shutdown when encountering an error

---
 backends/platform/bada/form.cpp   |  2 +-
 backends/platform/bada/system.cpp | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'backends/platform')

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() {
-- 
cgit v1.2.3