From f0f1b5ded68e8da9aa51aa94c4c1aed8cc0d086d Mon Sep 17 00:00:00 2001 From: Themaister Date: Wed, 30 Oct 2013 12:52:44 +0100 Subject: [PATCH] Style nits and build fix. --- config.def.h | 3 +-- settings.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config.def.h b/config.def.h index 29dffa4418..b323c02c92 100644 --- a/config.def.h +++ b/config.def.h @@ -272,7 +272,7 @@ static bool config_save_on_exit = false; #ifdef HAVE_OVERLAY // Default overlay directory #if defined(__QNX__) -static const char *default_overlay = "app/native/overlays/"; +static const char *default_overlay_dir = "app/native/overlays/"; #elif defined(IOS) static const char *default_overlay_dir = "/Applications/RetroArch.app/overlays/"; #elif defined(ANDROID) @@ -304,7 +304,6 @@ static const char *default_libretro_info_path = "/Applications/RetroArch.app/inf static const char *default_libretro_info_path = NULL; #endif - // Crop overscanned frames. static const bool crop_overscan = true; diff --git a/settings.c b/settings.c index 3886dbe1b6..22af8d6d41 100644 --- a/settings.c +++ b/settings.c @@ -332,21 +332,21 @@ void config_set_defaults(void) #endif #ifdef HAVE_OVERLAY - if (default_overlay_dir != NULL) + if (default_overlay_dir) { strlcpy(g_extern.overlay_dir, default_overlay_dir, sizeof(g_extern.overlay_dir)); #if defined(__QNX__) - snprintf(g_settings.input.overlay, sizeof(g_settings.input.overlay), "%ssnes-landscape.cfg", default_overlay_dir); + fill_pathname_join(g_settings.input.overlay, default_overlay_dir, "snes-landscape.cfg", sizeof(g_settings.input.overlay)); #endif } #endif #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) - if (default_shader_dir != NULL) + if (default_shader_dir) strlcpy(g_settings.video.shader_dir, default_shader_dir, sizeof(g_settings.video.shader_dir)); #endif - if (default_libretro_info_path != NULL) + if (default_libretro_info_path) strlcpy(g_settings.libretro_info_path, default_libretro_info_path, sizeof(g_settings.libretro_info_path)); g_extern.config_save_on_exit = config_save_on_exit;