diff --git a/Source/Project64-core/Settings.cpp b/Source/Project64-core/Settings.cpp index 26300f55a..107bad459 100644 --- a/Source/Project64-core/Settings.cpp +++ b/Source/Project64-core/Settings.cpp @@ -175,8 +175,12 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Rdb_ScreenHertz, new CSettingTypeRomDatabase("ScreenHertz", (uint32_t)0)); AddHandler(Rdb_FuncLookupMode, new CSettingTypeRomDatabase("FuncFind", (uint32_t)FuncFind_PhysicalLookup)); AddHandler(Rdb_RegCache, new CSettingTypeRDBYesNo("Reg Cache", true)); - AddHandler(Rdb_BlockLinking, new CSettingTypeRDBOnOff("Linking", true)); - AddHandler(Rdb_SMM_Cache, new CSettingTypeRomDatabase("SMM-Cache", true)); +#ifdef ANDROID + AddHandler(Rdb_BlockLinking, new CSettingTypeRDBOnOff("Linking", false)); +#else + AddHandler(Rdb_BlockLinking, new CSettingTypeRDBOnOff("Linking", true)); +#endif + AddHandler(Rdb_SMM_Cache, new CSettingTypeRomDatabase("SMM-Cache", true)); AddHandler(Rdb_SMM_StoreInstruc, new CSettingTypeRomDatabase("SMM-StoreInstr", false)); AddHandler(Rdb_SMM_PIDMA, new CSettingTypeRomDatabase("SMM-PI DMA", true)); AddHandler(Rdb_SMM_TLB, new CSettingTypeRomDatabase("SMM-TLB", true));