commit eab843f2c3077ed97f110a612ad04ac53b4bd278
author Jonathan Gordon <rockbox@jdgordon.info> Sun Nov 07 21:10:17 2010 +0000
committer Jonathan Gordon <rockbox@jdgordon.info> Sun Nov 07 21:10:17 2010 +0000
tree 36a0e921bb7e5395d50f4643bd54dc78202b463d
parent 8371d78519f3535ccfb3df0aeffe420774f7a99b

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

diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java
index 06ceb9c..47ea6c0 100644
--- a/android/src/org/rockbox/RockboxActivity.java
+++ b/android/src/org/rockbox/RockboxActivity.java
@@ -131,21 +131,24 @@
     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)