summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorGaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>2022-10-21 23:22:49 +0200
committerGaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>2022-10-22 13:36:55 +0200
commit88c57a00a351148c7c66787dc3af1c2e5e641305 (patch)
tree8ad36558cb020734631d9f5d33028390b957e8d4 /Source/Android/app/src/main/java
parent82d20ce352f51d05fbdc998cc1abd4514d5623cc (diff)
Show vWii System Menu version in Menu Bar
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java7
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java2
2 files changed, 7 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
index 480e7472e3..8fa685128b 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
@@ -161,9 +161,12 @@ public final class MainActivity extends AppCompatActivity
if (WiiUtils.isSystemMenuInstalled())
{
+ int resId = WiiUtils.isSystemMenuvWii() ?
+ R.string.grid_menu_load_vwii_system_menu_installed :
+ R.string.grid_menu_load_wii_system_menu_installed;
+
menu.findItem(R.id.menu_load_wii_system_menu).setTitle(
- getString(R.string.grid_menu_load_wii_system_menu_installed,
- WiiUtils.getSystemMenuVersion()));
+ getString(resId, WiiUtils.getSystemMenuVersion()));
}
return true;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java
index fb1d7e90cb..61dfedf5cd 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java
@@ -32,6 +32,8 @@ public final class WiiUtils
public static native boolean isSystemMenuInstalled();
+ public static native boolean isSystemMenuvWii();
+
public static native String getSystemMenuVersion();
public static native boolean syncSdFolderToSdImage();