From 2c00e7bd2db583c805033ac83fd01279a15be75e Mon Sep 17 00:00:00 2001
From: "BADIM-PC\\Vadim" <grigoruk@gmail.com>
Date: Mon, 16 Oct 2017 09:14:26 +0300
Subject: [PATCH 1/2] Crash on Android #324

---
 build/android/AndroidManifest.xml |  6 +++---
 build/android/default.properties  | 11 -----------
 build/android/project.properties  |  2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 build/android/default.properties

diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.xml
index 5ecdfae..065756a 100644
--- a/build/android/AndroidManifest.xml
+++ b/build/android/AndroidManifest.xml
@@ -4,12 +4,12 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.nesbox.tic"
-      android:versionCode="4600"
-      android:versionName="0.46.0"
+      android:versionCode="4601"
+      android:versionName="0.46.1"
       android:installLocation="auto">
 
     <!-- Android 2.3.3 -->
-    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="12" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
 
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" />
diff --git a/build/android/default.properties b/build/android/default.properties
deleted file mode 100644
index 0cdab95..0000000
--- a/build/android/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must be checked in Version Control Systems.
-# 
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-12
diff --git a/build/android/project.properties b/build/android/project.properties
index 0f507e5..8937e94 100644
--- a/build/android/project.properties
+++ b/build/android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-12
+target=android-14

From 2e09116513ed8aba27a4f616fb7719fecc68b095 Mon Sep 17 00:00:00 2001
From: "BADIM-PC\\Vadim" <grigoruk@gmail.com>
Date: Mon, 16 Oct 2017 10:26:07 +0300
Subject: [PATCH 2/2] btn() always returns number #339

---
 src/jsapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jsapi.c b/src/jsapi.c
index 65c9567..7eea49b 100644
--- a/src/jsapi.c
+++ b/src/jsapi.c
@@ -200,7 +200,7 @@ static duk_ret_t duk_btn(duk_context* duk)
 		else
 		{
 			s32 index = duk_to_int(duk, 0) & 0xf;
-			duk_push_uint(duk, machine->memory.ram.vram.input.gamepad.data & (1 << index));
+			duk_push_boolean(duk, machine->memory.ram.vram.input.gamepad.data & (1 << index));
 		}
 
 		return 1;