From dfd85d9a9a343d2deee0c78b1162e6a093ee6649 Mon Sep 17 00:00:00 2001
From: ExMix <rahuba.youri@mapswithme.com>
Date: Thu, 6 Mar 2014 14:33:48 +0300
Subject: [PATCH] crash fix

---
 map/balloon_manager.cpp | 1 -
 map/framework.cpp       | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/map/balloon_manager.cpp b/map/balloon_manager.cpp
index 746cd7bc41..96e4a12d1f 100644
--- a/map/balloon_manager.cpp
+++ b/map/balloon_manager.cpp
@@ -111,7 +111,6 @@ void PinClickManager::Shutdown()
 
 void PinClickManager::RenderPolicyCreated(graphics::EDensity density)
 {
-  Shutdown();
 }
 
 void PinClickManager::LocationChanged(location::GpsInfo const & info)
diff --git a/map/framework.cpp b/map/framework.cpp
index 8a7f600dec..911e852d14 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -617,7 +617,6 @@ void Framework::GetLocalMaps(vector<string> & outMaps) const
 
 void Framework::PrepareToShutdown()
 {
-  m_balloonManager.Shutdown();
   SetRenderPolicy(0);
 }
 
@@ -1339,10 +1338,11 @@ bool Framework::GetDistanceAndAzimut(m2::PointD const & point,
 
 void Framework::SetRenderPolicy(RenderPolicy * renderPolicy)
 {
+  m_balloonManager.Shutdown();
+  m_bmManager.DeleteScreen();
   m_guiController->ResetRenderParams();
   m_renderPolicy.reset();
   m_renderPolicy.reset(renderPolicy);
-  m_bmManager.DeleteScreen();
 
   if (m_renderPolicy)
   {