From faa6b05affb69290a29ad204566b08c290886b24 Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Mon, 8 Oct 2012 13:29:06 +0300
Subject: [PATCH] saving m_isLocationActive status between onPause/onResume to
 restore the my_position button state correctly.

---
 android/src/com/mapswithme/maps/MWMActivity.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java
index 1f7f3fc00c..9ba3768f50 100644
--- a/android/src/com/mapswithme/maps/MWMActivity.java
+++ b/android/src/com/mapswithme/maps/MWMActivity.java
@@ -41,6 +41,7 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
   private boolean m_hasLocation = false;
   private boolean m_hasCompass = false;
   private boolean m_isLocationActive = false;
+  private boolean m_locationWasActiveBeforePause = false;
   private boolean m_suggestAutoFollowMode = false;
 
   private LocationService getLocationService()
@@ -669,6 +670,8 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
   @Override
   protected void onPause()
   {
+    m_locationWasActiveBeforePause = m_isLocationActive;
+
     stopLocation();
 
     stopWatchingExternalStorage();
@@ -682,8 +685,11 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService
   protected void onResume()
   {
     final View v = findViewById(R.id.map_button_myposition);
-    if (v != null && v.isSelected())
+
+    if (v != null && m_locationWasActiveBeforePause)
     {
+      m_locationWasActiveBeforePause = false;
+
       // change button appearance to "looking for position"
       v.setBackgroundResource(R.drawable.myposition_button_normal);