M src/gba/core.c → src/gba/core.c

@@ -44,6 +44,7 @@ ARMSetComponents(cpu, &gba->d, GBA_COMPONENT_MAX, gbacore->components);
 	ARMInit(cpu);
 
 	GBAVideoSoftwareRendererCreate(&gbacore->renderer);
+	gbacore->renderer.outputBuffer = NULL;
 
 	gbacore->keys = 0;
 	gba->keySource = &gbacore->keys;

M src/platform/test/perf-main.c → src/platform/test/perf-main.c

@@ -103,10 +103,6 @@ if (!core) {
 		didFail = 1;
 		goto cleanup;
 	}
-
-	if (!perfOpts.noVideo) {
-		core->setVideoBuffer(core, outputBuffer, 256);
-	}
 	if (perfOpts.savestate) {
 		_savestate = VFileOpen(perfOpts.savestate, O_RDONLY);
 		free(perfOpts.savestate);
@@ -116,6 +112,9 @@ // TODO: Put back debugger
 	char gameCode[5] = { 0 };
 
 	core->init(core);
+	if (!perfOpts.noVideo) {
+		core->setVideoBuffer(core, outputBuffer, 256);
+	}
 	mCoreLoadFile(core, args.fname);
 	mCoreConfigInit(&core->config, "perf");
 	mCoreConfigLoad(&core->config);