all repos — mgba @ 39a8f528c084514f3a79877cd846824342c51d67

mGBA Game Boy Advance Emulator

GBA Thread: Don't skip BIOS if no ROM is loaded
Jeffrey Pfau jeffrey@endrift.com
Sun, 16 Aug 2015 13:00:37 -0700
commit

39a8f528c084514f3a79877cd846824342c51d67

parent

3a9ac188d40abee8689126bc0bf1a5b85054f625

1 files changed, 2 insertions(+), 2 deletions(-)

jump to
M src/gba/supervisor/thread.c → src/gba/supervisor/thread.c 
@@ -225,7 +225,7 @@ movie->startPlaying(movie, false);
 		GBARRInitPlay(&gba);
 	}
 
-	if (threadContext->skipBios) {
+	if (threadContext->skipBios && gba.memory.rom) {
 		GBASkipBIOS(&cpu);
 	}
 

@@ -305,7 +305,7 @@ }
 		MutexUnlock(&threadContext->stateMutex);
 		if (resetScheduled) {
 			ARMReset(&cpu);
-			if (threadContext->skipBios) {
+			if (threadContext->skipBios && gba.memory.rom) {
 				GBASkipBIOS(&cpu);
 			}
 		}