From 23a0f5318c50cdf3dce19e4de0c98fb5ae1c2618 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Sun, 7 Aug 2011 11:39:54 +0200
Subject: JANITORIAL: Remove trailing empty lines.

---
 backends/platform/android/android.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'backends/platform/android/android.cpp')

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 17c7d4f9cb..a935bf145d 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -602,4 +602,3 @@ void AndroidPluginProvider::addCustomDirectories(Common::FSList &dirs) const {
 #endif
 
 #endif
-
-- 
cgit v1.2.3


From c382c0c19522ce4771b74ac02377e75350550dd7 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Fri, 21 Oct 2011 14:25:53 +0200
Subject: ANDROID: Delete _timerManager in OSystem_Android's destructor.

If we leave it for OSystem, the DefaultTimerManager destructor tries
constructing a StackLock which, predictably, calls a pure virtual
function, because OSystem_Android's destructor is finished.
---
 backends/platform/android/android.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/platform/android/android.cpp')

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index a935bf145d..aba31320ea 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -174,6 +174,8 @@ OSystem_Android::~OSystem_Android() {
 	_mixer = 0;
 	delete _fsFactory;
 	_fsFactory = 0;
+	delete _timerManager;
+	_timerManager = 0;
 
 	deleteMutex(_event_queue_lock);
 }
-- 
cgit v1.2.3