From c95689e8f007298bc09a06758ec983a6449e35b0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 29 Sep 2013 21:45:50 +0200 Subject: [PATCH] (RMenu XUI) Add more HAVE_RMENU_XUI ifdefs --- settings.c | 6 +++--- xdk/xdk_d3d.cpp | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/settings.c b/settings.c index 2916f04ff4..deebaf7f8f 100644 --- a/settings.c +++ b/settings.c @@ -289,7 +289,7 @@ void config_set_defaults(void) *g_settings.system_directory = '\0'; *g_settings.input.autoconfig_dir = '\0'; *g_settings.input.overlay = '\0'; -#if defined(HAVE_RGUI) || defined(HAVE_RMENU) +#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI) *g_settings.rgui_browser_directory = '\0'; *g_settings.rgui_config_directory = '\0'; #endif @@ -351,7 +351,7 @@ void config_set_defaults(void) g_extern.config_save_on_exit = config_save_on_exit; -#if defined(HAVE_RMENU) || defined(HAVE_RGUI) +#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI) /* Avoid reloading config on every ROM load */ g_extern.block_config_read = true; #endif @@ -1045,7 +1045,7 @@ bool config_save_file(const char *path) config_set_string(conf, "savestate_directory", *g_extern.savestate_dir ? g_extern.savestate_dir : "default"); config_set_string(conf, "video_shader_dir", *g_settings.video.shader_dir ? g_settings.video.shader_dir : "default"); -#if defined(HAVE_RGUI) || defined(HAVE_RMENU) +#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI) config_set_string(conf, "rgui_browser_directory", *g_settings.rgui_browser_directory ? g_settings.rgui_browser_directory : "default"); config_set_string(conf, "rgui_config_directory", *g_settings.rgui_config_directory ? g_settings.rgui_config_directory : "default"); #endif diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index 59aede0b58..fc0cd23bbb 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -386,7 +386,9 @@ void xdk_d3d_generate_pp(D3DPRESENT_PARAMETERS *d3dpp, const video_info_t *video d3d->base_size = video->rgb32 ? sizeof(uint32_t) : sizeof(uint16_t); unsigned width, height; - d3d->ctx_driver->get_video_size(&width, &height); + + if (d3d->ctx_driver) + d3d->ctx_driver->get_video_size(&width, &height); d3dpp->BackBufferWidth = d3d->win_width = width; d3dpp->BackBufferHeight = d3d->win_height = height;