From eab843f2c3077ed97f110a612ad04ac53b4bd278 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 7 Nov 2010 21:10:17 +0000 Subject: [PATCH] android: don't crash if the user presses HOME while the loading screen is showing, this shuld also be made canceleable later git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28530 a1c6a512-1295-4272-9138-f99709370657 --- android/src/org/rockbox/RockboxActivity.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java index 06ceb9c35f..47ea6c0ca4 100644 --- a/android/src/org/rockbox/RockboxActivity.java +++ b/android/src/org/rockbox/RockboxActivity.java @@ -131,21 +131,24 @@ public class RockboxActivity extends Activity protected void onPause() { super.onPause(); - rbservice.set_activity(null); + if (rbservice != null) + rbservice.set_activity(null); } @Override protected void onStop() { super.onStop(); - rbservice.set_activity(null); + if (rbservice != null) + rbservice.set_activity(null); } @Override protected void onDestroy() { super.onDestroy(); - rbservice.set_activity(null); + if (rbservice != null) + rbservice.set_activity(null); } private void LOG(CharSequence text)