@@ -396,7 +396,7 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, const rg
396396 .buildDate = RG_BUILD_DATE ,
397397 .buildInfo = RG_BUILD_INFO ,
398398 .configNs = RG_PROJECT_APP ,
399- .bootArgs = NULL ,
399+ .bootArgs = "" ,
400400 .bootFlags = 0 ,
401401 .indicatorsMask = (1 << RG_INDICATOR_POWER_LOW ),
402402 .speed = 1.f ,
@@ -481,7 +481,7 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, const rg
481481 app .lowMemoryMode = statistics .totalMemoryExt == 0 ;
482482
483483 // Check if we have a valid boot config (selected emulator, rom file, save state, etc)
484- if (bootConfig .magicWord != RG_STRUCT_MAGIC || app .isColdBoot )
484+ if (bootConfig .magicWord != RG_STRUCT_MAGIC ) // || app.isColdBoot
485485 {
486486 memset (& bootConfig , 0 , sizeof (bootConfig ));
487487 void * data_ptr = (void * )& bootConfig ;
@@ -493,9 +493,9 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, const rg
493493 app .configNs = strdup (bootConfig .name );
494494 app .bootArgs = strdup (bootConfig .args );
495495 app .bootFlags = bootConfig .flags ;
496+ app .saveSlot = (app .bootFlags & RG_BOOT_SLOT_MASK ) >> 4 ;
497+ app .romPath = app .bootArgs ;
496498 }
497- app .saveSlot = (app .bootFlags & RG_BOOT_SLOT_MASK ) >> 4 ;
498- app .romPath = app .bootArgs ;
499499
500500 rg_settings_init ();
501501 app .indicatorsMask = rg_settings_get_number (NS_GLOBAL , SETTING_INDICATOR_MASK , app .indicatorsMask );
0 commit comments