From 94c15213f3e09c33c59948bb86d6b8c13af2bcb1 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Sun, 21 Aug 2016 13:12:19 +0300
Subject: [PATCH] [android] fix: Accidental crash after OnSaveInstanceState().

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

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 0a82bf4e27..19cdd0c125 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -19,9 +19,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
 
-import java.io.Serializable;
-import java.util.Stack;
-
 import com.mapswithme.maps.Framework.MapObjectListener;
 import com.mapswithme.maps.activity.CustomNavigateUpListener;
 import com.mapswithme.maps.ads.LikesManager;
@@ -86,6 +83,9 @@ import com.mapswithme.util.statistics.Statistics;
 import ru.mail.android.mytarget.nativeads.NativeAppwallAd;
 import ru.mail.android.mytarget.nativeads.banners.NativeAppwallBanner;
 
+import java.io.Serializable;
+import java.util.Stack;
+
 public class MwmActivity extends BaseMwmFragmentActivity
                       implements MapObjectListener,
                                  View.OnTouchListener,
@@ -883,7 +883,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     if (!closePlacePage() && !closeSidePanel() &&
         !RoutingController.get().cancel() && !closePositionChooser())
-      super.onBackPressed();
+    {
+      try
+      {
+        super.onBackPressed();
+      } catch (IllegalStateException e)
+      {
+        // Sometimes this can be called after onSaveInstanceState() for unknown reason.
+      }
+    }
   }
 
   private boolean interceptBackPress()