From bf62cb8bd14f94668260e053871ac840b2ee4844 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Thu, 17 May 2018 08:08:56 -0400 Subject: [PATCH] Prevent overriding Android setting w/ config.ini --- core/nullDC.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/nullDC.cpp b/core/nullDC.cpp index 6c8ac67f0..0a21d95f8 100755 --- a/core/nullDC.cpp +++ b/core/nullDC.cpp @@ -256,12 +256,12 @@ void LoadSettings() settings.debug.SerialConsole = cfgLoadInt("config", "Debug.SerialConsoleEnabled", 0) != 0; - settings.reios.ElfFile = cfgLoadStr("reios", "ElfFile",""); + settings.bios.UseReios = cfgLoadInt("config", "bios.UseReios", 0); + settings.reios.ElfFile = cfgLoadStr("reios", "ElfFile", ""); settings.validate.OpenGlChecks = cfgLoadInt("validate", "OpenGlChecks", 0) != 0; #endif - settings.bios.UseReios = cfgLoadInt("config", "bios.UseReios", 0); settings.pvr.HashLogFile = cfgLoadStr("testing", "ta.HashLogFile", ""); settings.pvr.HashCheckFile = cfgLoadStr("testing", "ta.HashCheckFile", "");