minor frontend fixes
authornotaz <notasas@gmail.com>
Sat, 13 Jul 2013 21:05:19 +0000 (00:05 +0300)
committernotaz <notasas@gmail.com>
Sat, 13 Jul 2013 21:49:35 +0000 (00:49 +0300)
platform/common/main.c
platform/common/menu_pico.c
platform/common/plat_sdl.c

index 6c922a9..e8f92b9 100644 (file)
@@ -34,7 +34,9 @@ void parse_cmd_line(int argc, char *argv[])
                        if (strcasecmp(argv[x], "-config") == 0) {\r
                                if (x+1 < argc) { ++x; PicoConfigFile = argv[x]; }\r
                        }\r
-                       else if (strcasecmp(argv[x], "-loadstate") == 0) {\r
+                       else if (strcasecmp(argv[x], "-loadstate") == 0\r
+                                || strcasecmp(argv[x], "-load") == 0)\r
+                       {\r
                                if (x+1 < argc) { ++x; load_state_slot = atoi(argv[x]); }\r
                        }\r
                        else if (strcasecmp(argv[x], "-pdb") == 0) {\r
index e3a6de3..3e7e71a 100644 (file)
@@ -76,6 +76,11 @@ static void make_bg(int no_scale)
        short *dst;
        int x, y;
 
+       if (src == NULL) {
+               memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
+               return;
+       }
+
        if (!no_scale && g_menuscreen_w / w >= 2 && g_menuscreen_h / h >= 2)
        {
                unsigned int t, *d = g_menubg_ptr;
index 8ea266f..94f6e6e 100644 (file)
@@ -142,6 +142,7 @@ void plat_video_wait_vsync(void)
 void plat_video_menu_enter(int is_rom_loaded)
 {
        plat_sdl_change_video_mode(g_menuscreen_w, g_menuscreen_h, 0);
+       g_screen_ptr = shadow_fb;
 }
 
 void plat_video_menu_begin(void)