Merge from libretro/master:7ff457f for repo synchronization

This commit is contained in:
kub 2022-04-19 23:58:59 +02:00
parent 45d0add214
commit a5085db3ea
19 changed files with 1015 additions and 311 deletions

View file

@ -451,7 +451,7 @@ int emu_reload_rom(const char *rom_fname_in)
emu_make_path(carthw_path, "carthw.cfg", sizeof(carthw_path));
media_type = PicoLoadMedia(rom_fname, carthw_path,
media_type = PicoLoadMedia(rom_fname, NULL, 0, carthw_path,
find_bios, do_region_override);
switch (media_type) {