From 289043098d9c352c497ed934c1e97ad52894f220 Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 19 Jun 2012 12:31:17 +0300 Subject: [PATCH] Fixed random bugs in Java code --- project/java/Settings.java | 7 ++++++- project/java/Video.java | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/project/java/Settings.java b/project/java/Settings.java index 6dd3479b9..472f48998 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -2276,7 +2276,7 @@ class Settings void setupButton(boolean undo) { do { - currentButton += undo ? -1 : 1; + currentButton += (undo ? -1 : 1); if(currentButton >= Globals.ScreenKbControlsLayout.length) { p.getVideoLayout().removeView(layout); @@ -2312,6 +2312,11 @@ class Settings public void onTouchEvent(final MotionEvent ev) { + if(Globals.ScreenKbControlsLayout.length >= currentButton) + { + setupButton(false); + return; + } if( ev.getAction() == MotionEvent.ACTION_DOWN ) { Globals.ScreenKbControlsLayout[currentButton][0] = (int)ev.getX(); diff --git a/project/java/Video.java b/project/java/Video.java index 3a9f5ac39..a7e5008d0 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -120,13 +120,13 @@ abstract class DifferentTouchInput return MultiTouchInput.Holder.sInstance; else return SingleTouchInput.Holder.sInstance; - } catch( java.lang.NoSuchMethodError e ) { + } catch( Exception e ) { try { if (multiTouchAvailable1 && multiTouchAvailable2) return MultiTouchInput.Holder.sInstance; else return SingleTouchInput.Holder.sInstance; - } catch( java.lang.NoSuchMethodError ee ) { + } catch( Exception ee ) { return SingleTouchInput.Holder.sInstance; } }