From 898176589711dbbb23c91bdc7f1eb46f1dc09454 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 12 Mar 2016 15:32:53 -0800
Subject: [PATCH] fix finish() so it pops stack in fragment case

---
 .../XWords4/src/org/eehouse/android/xw4/DelegateBase.java   | 6 +++++-
 .../XWords4/src/org/eehouse/android/xw4/FragActivity.java   | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
index c67b859e2..e14f858d2 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
@@ -223,7 +223,11 @@ public class DelegateBase implements DlgClickNotify,
 
     protected void finish()
     {
-        m_activity.finish();
+        if ( m_activity instanceof FragActivity ) {
+            ((FragActivity)m_activity).finishFragment();
+        } else {
+            m_activity.finish();
+        }
     }
 
     protected String getString( int resID, Object... params )
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/FragActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/FragActivity.java
index 9d0c9593e..5fdbabfeb 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/FragActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/FragActivity.java
@@ -124,6 +124,11 @@ public class FragActivity extends FragmentActivity
     //     // addFragment( dbf );
     // }
 
+    protected void finishFragment()
+    {
+        popFragment( null );
+    }
+
     protected void popFragment( Fragment frag )
     {
         getSupportFragmentManager().popBackStack();