summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/src/org/rockbox/RockboxActivity.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java
index 0e2daa76fb..a6604418ed 100644
--- a/android/src/org/rockbox/RockboxActivity.java
+++ b/android/src/org/rockbox/RockboxActivity.java
@@ -60,11 +60,14 @@ public class RockboxActivity extends Activity
60 @Override 60 @Override
61 protected void onReceiveResult(final int resultCode, final Bundle resultData) 61 protected void onReceiveResult(final int resultCode, final Bundle resultData)
62 { 62 {
63 RockboxFramebuffer fb;
63 switch (resultCode) { 64 switch (resultCode) {
64 case RockboxService.RESULT_INVOKING_MAIN: 65 case RockboxService.RESULT_INVOKING_MAIN:
65 if (loadingdialog != null) 66 if (loadingdialog != null)
66 loadingdialog.dismiss(); 67 loadingdialog.dismiss();
67 setContentView(new RockboxFramebuffer(RockboxActivity.this)); 68 fb = new RockboxFramebuffer(RockboxActivity.this);
69 setContentView(fb);
70 fb.requestFocus();
68 break; 71 break;
69 case RockboxService.RESULT_LIB_LOAD_PROGRESS: 72 case RockboxService.RESULT_LIB_LOAD_PROGRESS:
70 if (loadingdialog == null) 73 if (loadingdialog == null)
@@ -78,7 +81,11 @@ public class RockboxActivity extends Activity
78 break; 81 break;
79 case RockboxService.RESULT_SERVICE_RUNNING: 82 case RockboxService.RESULT_SERVICE_RUNNING:
80 if (!unzip) /* defer to RESULT_INVOKING_MAIN */ 83 if (!unzip) /* defer to RESULT_INVOKING_MAIN */
81 setContentView(new RockboxFramebuffer(RockboxActivity.this)); 84 {
85 fb = new RockboxFramebuffer(RockboxActivity.this);
86 setContentView(fb);
87 fb.requestFocus();
88 }
82 setServiceActivity(true); 89 setServiceActivity(true);
83 break; 90 break;
84 case RockboxService.RESULT_ERROR_OCCURED: 91 case RockboxService.RESULT_ERROR_OCCURED: