From 12b29f003ad5800bdcc830a5508d90d7bc044315 Mon Sep 17 00:00:00 2001
From: Stefanos Kornilios Mitsis Poiitidis <skmp@nillware.com>
Date: Fri, 3 Jan 2014 18:55:25 +0100
Subject: [PATCH] Fix MOGA detection, change options to paths

---
 shell/android/res/values/strings.xml                  | 6 +++---
 shell/android/src/com/reicast/emulator/MOGAInput.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 90b0ccecd..ab66f48ad 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="browser_path">Default System Path</string>
     <string name="games_path">Storage Path (location of .gid .cdi or .cdh images)</string>
     <string name="game_path">Default Game Storage</string>
-    <string name="select_stretch">Stretch to Fullscreen</string>
+    <string name="select_stretch">Widescreen Mode</string>
     <string name="set_frameskip">Frameskipping Amount</string>
     <string name="select_render">PVR Rendering</string>
     <string name="games_listing">Available Dreamcast Games</string>
@@ -25,8 +25,8 @@
     <!-- Nav Drawer Menu Items -->
     <string-array name="nav_drawer_items">
         <item>Browser</item>
-        <item>Options</item>
-        <item>Emulator</item>
+        <item>Paths</item>
+        <item>Settings</item>
         <item>About</item>
     </string-array>
 
diff --git a/shell/android/src/com/reicast/emulator/MOGAInput.java b/shell/android/src/com/reicast/emulator/MOGAInput.java
index 800763e60..81609a2f2 100644
--- a/shell/android/src/com/reicast/emulator/MOGAInput.java
+++ b/shell/android/src/com/reicast/emulator/MOGAInput.java
@@ -193,7 +193,7 @@ public class MOGAInput
 		{
 			JNIdc.hide_osd();
 
-			if (event.getState() == ACTION_CONNECTED) {
+			if (event.getState() == StateEvent.STATE_CONNECTION && event.getAction() == ACTION_CONNECTED) {
         		Toast.makeText(act.getApplicationContext(), "MOGA Connected!", Toast.LENGTH_SHORT).show();
         		isActive = true;
 			}