From 484523f82f053479b0fd6f9fb98fca7e6bc5b221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Tue, 27 Jun 2023 23:09:53 +0300
Subject: [PATCH] Use static initialization for Android class loader

---
 src/openrct2/platform/Platform.Android.cpp | 7 +------
 src/openrct2/platform/Platform.Common.cpp  | 9 ---------
 src/openrct2/platform/Platform.h           | 1 -
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/openrct2/platform/Platform.Android.cpp b/src/openrct2/platform/Platform.Android.cpp
index 8ca55ac3c4..068432d18d 100644
--- a/src/openrct2/platform/Platform.Android.cpp
+++ b/src/openrct2/platform/Platform.Android.cpp
@@ -27,7 +27,7 @@ AndroidClassLoader::~AndroidClassLoader()
 jobject AndroidClassLoader::_classLoader;
 jmethodID AndroidClassLoader::_findClassMethod;
 
-static std::shared_ptr<AndroidClassLoader> acl;
+static std::shared_ptr<AndroidClassLoader> acl = std::make_shared<AndroidClassLoader>();
 
 namespace Platform
 {
@@ -173,11 +173,6 @@ namespace Platform
         return displayScale;
     }
 
-    void AndroidInitClassLoader()
-    {
-        acl = std::make_shared<AndroidClassLoader>();
-    }
-
     jclass AndroidFindClass(JNIEnv* env, std::string_view name)
     {
         return static_cast<jclass>(env->CallObjectMethod(
diff --git a/src/openrct2/platform/Platform.Common.cpp b/src/openrct2/platform/Platform.Common.cpp
index fbbfd2afb0..051925b9f8 100644
--- a/src/openrct2/platform/Platform.Common.cpp
+++ b/src/openrct2/platform/Platform.Common.cpp
@@ -39,15 +39,6 @@ namespace Platform
 {
     void CoreInit()
     {
-        static bool initialised = false;
-        if (!initialised)
-        {
-            initialised = true;
-
-#ifdef __ANDROID__
-            Platform::AndroidInitClassLoader();
-#endif // __ANDROID__
-        }
     }
 
     CurrencyType GetCurrencyValue(const char* currCode)
diff --git a/src/openrct2/platform/Platform.h b/src/openrct2/platform/Platform.h
index 11f59e4f0f..607387ec9a 100644
--- a/src/openrct2/platform/Platform.h
+++ b/src/openrct2/platform/Platform.h
@@ -103,7 +103,6 @@ namespace Platform
     bool SetupUriProtocol();
 #endif
 #ifdef __ANDROID__
-    void AndroidInitClassLoader();
     jclass AndroidFindClass(JNIEnv* env, std::string_view name);
 #endif