ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB Core: Fix GBC colors setting breaking default model overrides (fixes #2161)

This commit is contained in:
Vicki Pfau 2021-05-06 13:22:04 -07:00
parent df0bb5cd48
commit 821dbd4bd6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -3,6 +3,7 @@ Emulation fixes:
- GBA Video: Revert scanline latching changes (fixes mgba.io/i/2153, mgba.io/i/2149) - GBA Video: Revert scanline latching changes (fixes mgba.io/i/2153, mgba.io/i/2149)
Other fixes: Other fixes:
- Core: Fix memory leak in opening games from the library - Core: Fix memory leak in opening games from the library
- GB Core: Fix GBC colors setting breaking default model overrides (fixes mgba.io/i/2161)
- Qt: Fix infrequent deadlock when using sync to video - Qt: Fix infrequent deadlock when using sync to video
- Qt: Fix applying savetype-only overrides - Qt: Fix applying savetype-only overrides
- Util: Fix loading UPS patches that affect the last byte of the file - Util: Fix loading UPS patches that affect the last byte of the file

3
src/gb/core.c
View File

@ -446,7 +446,8 @@ static void _GBCoreReset(struct mCore* core) {
bool modelOverride = GBOverrideFind(gbcore->overrides, &override) || (doColorOverride && GBOverrideColorFind(&override)); bool modelOverride = GBOverrideFind(gbcore->overrides, &override) || (doColorOverride && GBOverrideColorFind(&override));
if (modelOverride) { if (modelOverride) {
GBOverrideApply(gb, &override); GBOverrideApply(gb, &override);
} else { }
if (!modelOverride || override.model == GB_MODEL_AUTODETECT) {
const char* modelGB = mCoreConfigGetValue(&core->config, "gb.model"); const char* modelGB = mCoreConfigGetValue(&core->config, "gb.model");
const char* modelSGB = mCoreConfigGetValue(&core->config, "sgb.model"); const char* modelSGB = mCoreConfigGetValue(&core->config, "sgb.model");
const char* modelCGB = mCoreConfigGetValue(&core->config, "cgb.model"); const char* modelCGB = mCoreConfigGetValue(&core->config, "cgb.model");