From c8e463d9784498e06c0bc156b7bacd7c28af1ff5 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Fri, 24 May 2013 22:54:45 +0100
Subject: Fix activity stack when restarting the screen nail

We were stacking multiple activities, resulting in the need for multiple
destructions (back key events) when killing the camera app

Change-Id: I7ec61c517d25f7e47baf47fcd1696f987631c344
---
 src/com/android/gallery3d/app/StateManager.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java
index fa7d857ba..4f0b1965c 100644
--- a/src/com/android/gallery3d/app/StateManager.java
+++ b/src/com/android/gallery3d/app/StateManager.java
@@ -84,6 +84,10 @@ public class StateManager {
         }
         state.initialize(mActivity, data);
 
+        if (!mStack.isEmpty()) {
+            mStack.pop();
+        }
+
         mStack.push(new StateEntry(data, state));
         state.onCreate(data, null);
         if (mIsResumed) state.resume();
-- 
cgit v1.2.3