From 84030ece39bcc400e27effdf290c8adf2558ef45 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Tue, 5 Apr 2016 14:49:22 +0300
Subject: [PATCH] [android] fix: Possible crash fix in RoutingController.

---
 android/src/com/mapswithme/maps/MwmActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index bb91b5502c..32d80ce6f1 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -379,7 +379,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     mNavigationController = new NavigationController(this);
-    RoutingController.get().attach(this);
     initMenu();
     initOnmapDownloader();
     initPositionChooser();
@@ -678,7 +677,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     Framework.nativeRemoveMapObjectListener();
     BottomSheetHelper.free();
-    RoutingController.get().detach();
     super.onDestroy();
   }
 
@@ -1019,6 +1017,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     super.onStart();
     initShowcase();
+    RoutingController.get().attach(this);
   }
 
   @Override
@@ -1026,6 +1025,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     super.onStop();
     mMytargetHelper.cancel();
+    RoutingController.get().detach();
   }
 
   @Override