Merge pull request #1338 from hieupham007/timob-7240

timob-7240: remove children of tabgroup properly
tidev · Feb 6, 2012 · 0d7a425 · 0d7a425
2 parents 29fa518 + f6a0a41
commit 0d7a425
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/TiTabActivity.java b/android/modules/ui/src/java/ti/modules/titanium/ui/TiTabActivity.java
@@ -198,7 +198,6 @@ protected void onResume()
 	@Override
 	protected void onDestroy()
 	{
-		TiApplication.removeFromActivityStack(this);
 
 		super.onDestroy();
 

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
@@ -789,7 +789,9 @@ protected void onDestroy()
 			}
 		}
 
-		if (!isTabActivity()) {
+		boolean isTab = isTabActivity();
+		//When we close a tabgroup, we don't remove its children from the stack, so here we remove the children if the parent is finishing.
+		if (!isTab || (isTab && this.getParent().isFinishing())) {
 			TiApplication.removeFromActivityStack(this);
 		}