M src/platform/3ds/main.c → src/platform/3ds/main.c

@@ -42,9 +42,6 @@
 	renderer.outputBuffer = videoBuffer;
 	renderer.outputBufferStride = VIDEO_HORIZONTAL_PIXELS;
 
-	gba->keySource = &activeKeys;
-	gba->sync = 0;
-
 	FS_archive sdmcArchive = (FS_archive) {
 		ARCH_SDMC,
 		(FS_path) { PATH_EMPTY, 1, (u8*)"" },
@@ -59,6 +56,9 @@
 	GBACreate(gba);
 	ARMSetComponents(cpu, &gba->d, 0, 0);
 	ARMInit(cpu);
+
+	gba->keySource = &activeKeys;
+	gba->sync = 0;
 
 	GBAVideoAssociateRenderer(&gba->video, &renderer.d);
 
@@ -77,6 +77,7 @@ gfxFlushBuffers();
 				gfxSwapBuffersGpu();
 				gspWaitForVBlank();
 				hidScanInput();
+				activeKeys = hidKeysHeld() & 0x3FF;
 			}
 		}
 		inVblank = GBARegisterDISPSTATGetInVblank(gba->video.dispstat);