From a35beb22d712b6da85a794115b19d484a12c8643 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 24 Dec 2012 21:38:40 +0100
Subject: NEWT/Android: Fix NewtBaseActivity.getWindow() recursion if used w/o
delegated Activity, i.e. our ActivityLauncher
---
src/newt/classes/jogamp/newt/driver/android/NewtBaseActivity.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/newt/classes/jogamp/newt/driver/android/NewtBaseActivity.java b/src/newt/classes/jogamp/newt/driver/android/NewtBaseActivity.java
index 28c4da72f..c2379b648 100644
--- a/src/newt/classes/jogamp/newt/driver/android/NewtBaseActivity.java
+++ b/src/newt/classes/jogamp/newt/driver/android/NewtBaseActivity.java
@@ -59,8 +59,8 @@ public class NewtBaseActivity extends Activity {
}
public void setRootActivity(Activity rootActivity) {
- this.isDelegatedActivity = true;
this.rootActivity = rootActivity;
+ this.isDelegatedActivity = this != rootActivity;
}
public final boolean isDelegatedActivity() {
@@ -231,7 +231,11 @@ public class NewtBaseActivity extends Activity {
@Override
public android.view.Window getWindow() {
- return getActivity().getWindow();
+ if( isDelegatedActivity() ) {
+ return getActivity().getWindow();
+ } else {
+ return getWindow();
+ }
}
@Override
--
cgit v1.2.3