Merge pull request #7478 from stenzek/imgui

Replace raster font with dear imgui

3 files changed, 13 insertions, 4 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index 442a4e8644..b901f2f691 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -21,7 +21,16 @@ import java.lang.ref.WeakReference;
  */
 public final class NativeLibrary
 {
-  public static WeakReference<EmulationActivity> sEmulationActivity = new WeakReference<>(null);
+  private static WeakReference<EmulationActivity> sEmulationActivity = new WeakReference<>(null);
+
+  /**
+   * Returns the current instance of EmulationActivity.
+   * There should only ever be one EmulationActivity instantiated.
+   */
+  public static EmulationActivity getEmulationActivity()
+  {
+    return sEmulationActivity.get();
+  }
 
   /**
    * Button type for use in onTouchEvent
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java
index d83c348ea2..babf5069e5 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_GCAdapter.java
@@ -31,7 +31,7 @@ public class Java_GCAdapter
 
   private static void RequestPermission()
   {
-    Context context = NativeLibrary.sEmulationActivity.get();
+    Context context = NativeLibrary.getEmulationActivity();
     if (context != null)
     {
       HashMap<String, UsbDevice> devices = manager.getDeviceList();
@@ -141,7 +141,7 @@ public class Java_GCAdapter
             }
           }
 
-          final Activity emulationActivity = NativeLibrary.sEmulationActivity.get();
+          final Activity emulationActivity = NativeLibrary.getEmulationActivity();
           if (emulationActivity != null)
           {
             emulationActivity.runOnUiThread(() -> Toast.makeText(emulationActivity,
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java
index de11e4fd62..4ecc1a64ca 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java
@@ -34,7 +34,7 @@ public class Java_WiimoteAdapter
 
   private static void RequestPermission()
   {
-    Context context = NativeLibrary.sEmulationActivity.get();
+    Context context = NativeLibrary.getEmulationActivity();
     if (context != null)
     {
       HashMap<String, UsbDevice> devices = manager.getDeviceList();