1 files changed, 6 insertions, 2 deletions

diff --git a/firmware/target/hosted/android/button-android.c b/firmware/target/hosted/android/button-android.c
index 832eef54f3..ed1e125223 100644
--- a/firmware/target/hosted/android/button-android.c
+++ b/firmware/target/hosted/android/button-android.c
@@ -29,6 +29,7 @@
 #include "system.h"
 #include "touchscreen.h"
 
+extern JNIEnv *env_ptr;
 static int last_y, last_x;
 static int last_btns;
 
@@ -61,11 +62,11 @@ Java_org_rockbox_RockboxFramebuffer_touchHandler(JNIEnv*env, jobject this,
  * this writes in an interrupt-like fashion the button events that the user
  * generated by pressing/releasing them to a variable */
 JNIEXPORT bool JNICALL
-Java_org_rockbox_RockboxFramebuffer_buttonHandler(JNIEnv*env, jclass this,
+Java_org_rockbox_RockboxFramebuffer_buttonHandler(JNIEnv*env, jclass class,
                                                   jint keycode, jboolean state)
 {
     (void)env;
-    (void)this;
+    (void)class;
 
     unsigned button = 0;
 
@@ -75,7 +76,10 @@ Java_org_rockbox_RockboxFramebuffer_buttonHandler(JNIEnv*env, jclass this,
         if (!button)
             button = dpad_to_button((int)keycode);
         if (button)
+        {
             queue_post(&button_queue, button, 0);
+            return true;
+        }
     }
 
     if (!button)