diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index 251a5d31ce..bf0dbbc6ec 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -294,7 +294,6 @@ static void get_environment_settings(int argc, char *argv[]) /* now we fill in all the variables */ snprintf(default_paths.border_file, sizeof(default_paths.border_file), "%s/borders/Centered-1080p/mega-man-2.png", default_paths.core_dir); snprintf(default_paths.menu_border_file, sizeof(default_paths.menu_border_file), "%s/borders/Menu/main-menu.png", default_paths.core_dir); - snprintf(g_extern.console.menu_texture_path, sizeof(g_extern.console.menu_texture_path), "%s", default_paths.menu_border_file); snprintf(default_paths.cgp_dir, sizeof(default_paths.cgp_dir), "%s/presets", default_paths.core_dir); snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/input", default_paths.cgp_dir); snprintf(default_paths.border_dir, sizeof(default_paths.border_dir), "%s/borders", default_paths.core_dir); diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c index 3236a9f4da..64da0e0a21 100644 --- a/gfx/context/ps3_ctx.c +++ b/gfx/context/ps3_ctx.c @@ -329,7 +329,7 @@ void texture_image_border_load(const char *path) static bool gfx_ctx_rmenu_init(void) { - texture_image_border_load(default_paths.menu_border_file); + texture_image_border_load(g_extern.console.menu_texture_path); return true; } diff --git a/gfx/context/xdk_ctx.c b/gfx/context/xdk_ctx.c index fc10741fdc..383043b0d1 100644 --- a/gfx/context/xdk_ctx.c +++ b/gfx/context/xdk_ctx.c @@ -141,17 +141,21 @@ static bool gfx_ctx_xdk_menu_init(void) // Load background image if(width == 640) { - texture_image_load("D:\\Media\\main-menu_480p.png", &g_extern.console.menu_texture); + strlcpy(g_extern.console.menu_texture_path,"D:\\Media\\main-menu_480p.png", + sizeof(g_extern.console.menu_texture_path)); m_menuMainRomListPos_x = 60; m_menuMainRomListPos_y = 80; } else if(width == 1280) { - texture_image_load("D:\\Media\\main-menu_720p.png", &g_extern.console.menu_texture); + strlcpy(g_extern.console.menu_texture_path, "D:\\Media\\main-menu_720p.png", + sizeof(g_extern.console.menu_texture_path)); m_menuMainRomListPos_x = 360; m_menuMainRomListPos_y = 130; } + texture_image_load(g_extern.console.menu_texture_path, &g_extern.console.menu_texture); + // Load rom selector panel texture_image_load("D:\\Media\\menuMainRomSelectPanel.png", &g_extern.console.menu_panel); diff --git a/settings.c b/settings.c index 500b3f9f15..352f6858f5 100644 --- a/settings.c +++ b/settings.c @@ -272,6 +272,7 @@ void config_set_defaults(void) g_extern.console.screen.resolutions.current.id = 0; strlcpy(g_extern.console.main_wrap.default_rom_startup_dir, default_paths.filebrowser_startup_dir, sizeof(g_extern.console.main_wrap.default_rom_startup_dir)); strlcpy(g_extern.console.main_wrap.default_savestate_dir, default_paths.savestate_dir, sizeof(g_extern.console.main_wrap.default_savestate_dir)); + strlcpy(g_extern.console.menu_texture_path, default_paths.menu_border_file, sizeof(g_extern.console.menu_texture_path)); #if defined(__CELLOS_LV2) || defined(_XBOX360) g_settings.video.aspect_ratio_idx = ASPECT_RATIO_16_9; @@ -491,6 +492,9 @@ bool config_load_file(const char *path) if (config_get_path(conf, "default_rom_startup_dir", tmp_str, sizeof(tmp_str))) strlcpy(g_extern.console.main_wrap.default_rom_startup_dir, tmp_str, sizeof(g_extern.console.main_wrap.default_rom_startup_dir)); + if (config_get_path(conf, "menu_texture_path", tmp_str, sizeof(tmp_str))) + strlcpy(g_extern.console.menu_texture_path, tmp_str, sizeof(g_extern.console.menu_texture_path)); + if (config_get_bool(conf, "info_msg_enable", &msg_enable)) { if (msg_enable) @@ -1219,8 +1223,8 @@ bool config_save_file(const char *path) config_set_int(conf, "custom_viewport_x", g_extern.console.screen.viewports.custom_vp.x); config_set_int(conf, "custom_viewport_y", g_extern.console.screen.viewports.custom_vp.y); config_set_string(conf, "default_rom_startup_dir", g_extern.console.main_wrap.default_rom_startup_dir); + config_set_string(conf, "menu_texture_path", g_extern.console.menu_texture_path); config_set_float(conf, "overscan_amount", g_extern.console.screen.overscan_amount); - config_set_float(conf, "video_font_size", g_settings.video.font_size); // g_extern