Fix a bug causing newly imported ROMs to sometime incorrectly prefer …

…SGB over CGB
LIJI32 · May 27, 2024 · 2bf8feb · 2bf8feb
1 parent e5e9cf1
commit 2bf8feb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/iOS/GBViewController.m b/iOS/GBViewController.m
@@ -491,9 +491,11 @@ - (void)loadROM
                 // Newly played ROM, pick the best model
                 uint8_t *rom = GB_get_direct_access(&_gb, GB_DIRECT_ACCESS_ROM, NULL, NULL);
 
-                if ((rom[0x143] & 0x80) && !GB_is_cgb(&_gb)) {
+                if ((rom[0x143] & 0x80)) {
+                    if (!GB_is_cgb(&_gb)) {
                         GB_switch_model_and_reset(&_gb, [[NSUserDefaults standardUserDefaults] integerForKey:@"GBCGBModel"]);
                     }
+                }
                 else if ((rom[0x146]  == 3) && !GB_is_sgb(&_gb)) {
                     GB_switch_model_and_reset(&_gb, [[NSUserDefaults standardUserDefaults] integerForKey:@"GBSGBModel"]);
                 }