summaryrefslogtreecommitdiffstats
path: root/android/src
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-11-07 21:10:17 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-11-07 21:10:17 +0000
commiteab843f2c3077ed97f110a612ad04ac53b4bd278 (patch)
tree36a0e921bb7e5395d50f4643bd54dc78202b463d /android/src
parent8371d78519f3535ccfb3df0aeffe420774f7a99b (diff)
downloadrockbox-eab843f2c3077ed97f110a612ad04ac53b4bd278.tar.gz
rockbox-eab843f2c3077ed97f110a612ad04ac53b4bd278.tar.bz2
rockbox-eab843f2c3077ed97f110a612ad04ac53b4bd278.zip
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
Diffstat (limited to 'android/src')
-rw-r--r--android/src/org/rockbox/RockboxActivity.java9
1 files 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)