X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=235861b0bfe387384aaacb9c23df437da5cedd2d;hb=8340e7c99fd3e44c6b8bd3239b7676b16b73d028;hp=822d7aab9cb598628517fd8f0147b2648d6f0d97;hpb=a4edca53b489370b0814a74579acbcc183578355;p=picodrive.git diff --git a/platform/common/emu.c b/platform/common/emu.c index 822d7aa..235861b 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -497,11 +497,13 @@ int emu_reload_rom(char *rom_fname) get_ext(rom_fname, ext); - // check for movie file + // early cleanup + PicoPatchUnload(); if (movie_data) { free(movie_data); movie_data = 0; } + if (!strcmp(ext, ".gmv")) { // check for both gmv and rom @@ -558,7 +560,6 @@ int emu_reload_rom(char *rom_fname) } shutdown_MCD(); - PicoPatchUnload(); PicoCartUnload(); rom_loaded = 0; @@ -1356,6 +1357,7 @@ void emu_cmn_forced_frame(int no_scale, int do_emu) memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4); + PicoOpt &= ~POPT_ALT_RENDERER; PicoOpt |= POPT_ACC_SPRITES; if (!no_scale) PicoOpt |= POPT_EN_SOFTSCALE;