diff options
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java | 5 | ||||
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java index 71309897..ec73f5e3 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java @@ -63,7 +63,10 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen show(last_telem_state, last_state, last_from_receiver, last_receiver); } else ft.hide(this); - ft.commitAllowingStateLoss(); + try { + ft.commitAllowingStateLoss(); + } catch (IllegalStateException ie) { + } } @Override diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java index d970fc4f..6c2d9d7a 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java @@ -256,6 +256,12 @@ public class SetupActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + AltosDebug.init(this); + AltosDebug.debug("+++ ON CREATE +++"); + + // Initialise preferences + AltosDroidPreferences.init(this); + // Setup the window requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); setContentView(R.layout.setup); |