From 6d059c046a4959a23331e9d6ab321b9d1a842177 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Tue, 18 Sep 2012 10:06:44 +0300
Subject: [PATCH] Tiny fix to data downloader

---
 project/java/DataDownloader.java                 | 16 +++++++++++++++-
 .../application/commandergenius/commandergenius  |  2 +-
 .../application/openttd/AndroidAppSettings.cfg   |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/project/java/DataDownloader.java b/project/java/DataDownloader.java
index deb046cfa..358987451 100644
--- a/project/java/DataDownloader.java
+++ b/project/java/DataDownloader.java
@@ -292,8 +292,22 @@ class DataDownloader extends Thread
 			Status.setText( downloadCount + "/" + downloadTotal + ": " + res.getString(R.string.connecting_to, url) );
 			if( url.indexOf("http://") == -1 && url.indexOf("https://") == -1 ) // File inside assets
 			{
-				System.out.println("Fetching file from assets: " + url);
+				InputStream stream1 = null;
+				try {
+					stream1 = Parent.getAssets().open(url);
+					stream1.close();
+				} catch( Exception e ) {
+					try {
+						stream1 = Parent.getAssets().open(url + "00");
+						stream1.close();
+					} catch( Exception ee ) {
+						System.out.println("Failed to open file in assets: " + url);
+						downloadUrlIndex++;
+						continue;
+					}
+				}
 				FileInAssets = true;
+				System.out.println("Fetching file from assets: " + url);
 				break;
 			}
 			else
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index d1b8a7ae0..023025901 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit d1b8a7ae03b1a0960722abbab38bbb8fca98e7cd
+Subproject commit 023025901a1d96a46d826791bf9cf264ddf5c9ee
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index b61f0ac25..8b7350211 100644
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -34,8 +34,8 @@ StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig'
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=12219
-AppVersionName="1.2.2.19"
+AppVersionCode=12220
+AppVersionName="1.2.2.20"
 ResetSdlConfigForThisVersion=n
 DeleteFilesOnUpgrade="%"
 CompiledLibraries="jpeg png freetype timidity lzma lzo2"