From 3c653cb3fc31cc3ec1ce238e0915124f9ab0bd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 11 Jul 2013 14:29:56 +0200 Subject: [PATCH] Drop the gameinfocache correctly on shutdown, avoiding a log flood and possible mem leak on android. --- UI/NativeApp.cpp | 4 +++- lang | 2 +- native | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index b40e3e37f9..742a52798a 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -533,7 +533,7 @@ void NativeUpdate(InputState &input) { UIUpdateMouse(0, input.pointer_x[0], input.pointer_y[0], input.pointer_down[0]); screenManager->update(input); -} +} void NativeDeviceLost() { g_gameInfoCache.Clear(); @@ -573,6 +573,8 @@ void NativeMessageReceived(const char *message, const char *value) { } void NativeShutdownGraphics() { + g_gameInfoCache.Clear(); + delete uiTexture; uiTexture = NULL; diff --git a/lang b/lang index 955d9cde6c..92e5e45e31 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 955d9cde6c01a0950f76b1a6e92e2d972ca5c737 +Subproject commit 92e5e45e316f73710882bf82ef8fe43f5192d0f2 diff --git a/native b/native index bd93cd2f1e..ca7eb305e4 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit bd93cd2f1e02fbd25696a1ea21720d4fb3f48280 +Subproject commit ca7eb305e44b75307ff904f73e4e946f5a9f1395