From 114db227e97285dbce0edc4a3b9df4bce530f3de Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 11 Feb 2016 21:43:00 +0300
Subject: Fix crash on exit with enables onscreen buttons.
---
src/client.cpp | 3 ++-
src/input/touch/touchmanager.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/client.cpp b/src/client.cpp
index 9a2494bc0..bf1ccd3f5 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -628,6 +628,8 @@ void Client::gameClear()
if (logger)
logger->log1("Quitting3");
+ touchManager.clear();
+
graphicsManager.deleteRenderers();
if (logger)
@@ -648,7 +650,6 @@ void Client::gameClear()
ActorSprite::unload();
- touchManager.clear();
ResourceManager::deleteInstance();
if (logger)
diff --git a/src/input/touch/touchmanager.cpp b/src/input/touch/touchmanager.cpp
index 5c7de8189..85dce0f9a 100644
--- a/src/input/touch/touchmanager.cpp
+++ b/src/input/touch/touchmanager.cpp
@@ -74,7 +74,6 @@ TouchManager::TouchManager() :
TouchManager::~TouchManager()
{
clear();
- delete2(mVertexes);
CHECKLISTENERS
}
@@ -191,6 +190,7 @@ void TouchManager::clear() restrict2
FOR_EACH (TouchItemVectorCIter, it, mObjects)
unload(*it);
mObjects.clear();
+ delete2(mVertexes);
mRedraw = true;
}
--
cgit v1.2.3-70-g09d2