summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2020-09-01 07:25:59 -0400
committerGitHub <noreply@github.com>2020-09-01 07:25:59 -0400
commitd17c407f09d7bb84690ecd226d2c5ffb330d3a81 (patch)
tree11b03939096d247a28f44be34996df965900a0c6 /Source/Android/app/src/main/java
parent42a7c959e1a0321a625ac67a19d0b97d140478d5 (diff)
parent9fe6466c79d9b55990cd554e874eb3a887995ee4 (diff)
Merge pull request #9052 from Ebola16/GCAT
Android: Better GCAdapter scanning thread management
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java2
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java1
2 files changed, 3 insertions, 0 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 a07469b888..58c5f0e488 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
@@ -376,6 +376,8 @@ public final class NativeLibrary
public static native void ReloadConfig();
+ public static native void UpdateGCAdapterScanThread();
+
/**
* Initializes the native parts of the app.
*
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
index b07a3d2917..322b52f894 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
@@ -232,6 +232,7 @@ public class Settings
NativeLibrary.ReloadConfig();
NativeLibrary.ReloadWiimoteConfig();
NativeLibrary.ReloadLoggerConfig();
+ NativeLibrary.UpdateGCAdapterScanThread();
if (modifiedSettings.contains(SettingsFile.KEY_RECURSIVE_ISO_PATHS))
{