Merge pull request #12917 from JosJuice/transfer-sysconf-control

Explicitly transfer control of SYSCONF to emulated system
This commit is contained in:
Dentomologist
2026-02-14 11:35:59 -08:00
committed by GitHub
4 changed files with 89 additions and 47 deletions

View File

@@ -11,7 +11,6 @@
#include "Core/ConfigLoaders/GameConfigLoader.h"
#include "Core/ConfigLoaders/IsSettingSaveable.h"
#include "jni/AndroidCommon/AndroidCommon.h"
#include "jni/Host.h"
constexpr jint LAYER_BASE_OR_CURRENT = 0;
constexpr jint LAYER_BASE = 1;
@@ -143,10 +142,6 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_unloadGameIn
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_save(
JNIEnv*, jclass, jint layer)
{
// HostThreadLock is used to ensure we don't try to save to SYSCONF at the same time as
// emulation shutdown does
HostThreadLock guard;
return GetLayer(layer, {})->Save();
}