all repos — mgba @ b750c76d02af94646309a700c86c04faf6707b7d

mGBA Game Boy Advance Emulator

GB Core: Fix SGB border option breaking if changed while running
Vicki Pfau vi@endrift.com
Thu, 07 Sep 2017 22:05:11 -0700
commit

b750c76d02af94646309a700c86c04faf6707b7d

parent

13d3e1dfecb6393c0f3f23e22b2e9e88afe4911a

1 files changed, 6 insertions(+), 5 deletions(-)

jump to
M src/gb/core.c → src/gb/core.c 
@@ -186,11 +186,7 @@ mCoreConfigCopyValue(&core->config, config, "gbc.bios");
 	mCoreConfigCopyValue(&core->config, config, "gb.model");
 	mCoreConfigCopyValue(&core->config, config, "sgb.model");
 	mCoreConfigCopyValue(&core->config, config, "cgb.model");
-
-	int fakeBool;
-	if (mCoreConfigGetIntValue(config, "sgb.borders", &fakeBool)) {
-		gb->video.sgbBorders = fakeBool;
-	}
+	mCoreConfigCopyValue(&core->config, config, "sgb.borders");
 
 #if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2
 	struct GBCore* gbcore = (struct GBCore*) core;

@@ -347,6 +343,11 @@ gb->model = GBNameToModel(modelCGB);
 		} else if (gb->model == GB_MODEL_SGB && modelSGB) {
 			gb->model = GBNameToModel(modelSGB);
 		}
+	}
+
+	int fakeBool;
+	if (mCoreConfigGetIntValue(&core->config, "sgb.borders", &fakeBool)) {
+		gb->video.sgbBorders = fakeBool;
 	}
 
 #if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2