From 2f2a2b4fa4335457337a3e2c49c003af78cae92c Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Sun, 9 Jan 2022 19:42:33 +0200 Subject: [PATCH] SDL: fixed a crash in SDL2 Java code --- project/java/Settings.java | 9 +++++++++ project/javaSDL2/MainActivity.java | 1 + 2 files changed, 10 insertions(+) diff --git a/project/java/Settings.java b/project/java/Settings.java index 61cc6915d..a92fa94f8 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -204,6 +204,15 @@ public class Settings static boolean LoadConfig( final MainActivity p ) { + Globals.OptionalDataDownload = new boolean[Globals.DataDownloadUrl.length]; + for( int i = 0; i < Globals.DataDownloadUrl.length; i++ ) + { + if( Globals.DataDownloadUrl[i].indexOf("!") == 0 ) + { + Globals.OptionalDataDownload[i] = true; + } + } + try { ObjectInputStream settingsFile = new ObjectInputStream(new FileInputStream( p.getFilesDir().getAbsolutePath() + "/" + SettingsFileName )); if( settingsFile.readInt() != SETTINGS_FILE_VERSION ) diff --git a/project/javaSDL2/MainActivity.java b/project/javaSDL2/MainActivity.java index 1fee395c7..6fa9b8e80 100644 --- a/project/javaSDL2/MainActivity.java +++ b/project/javaSDL2/MainActivity.java @@ -161,6 +161,7 @@ public class MainActivity extends org.libsdl.app.SDLActivity { if (ret.size() >= 1) { ret.remove(0); } + Log.i("SDL", "Commandline arguments: '" + String.join("', '", ret) + "'"); return ret.toArray(new String[0]); }