From 1bdaf62be16c468f68f18864dd852a90cfe6f272 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 31 Oct 2013 02:34:49 +0100
Subject: [PATCH] Move some more default settings to config.def.h

---
 config.def.h                     | 6 ++++++
 frontend/platform/platform_qnx.c | 3 ---
 settings.c                       | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config.def.h b/config.def.h
index 957f7790a2..600073660f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -292,6 +292,12 @@ static const char *default_shader_dir = "/data/data/com.retroarch/shaders_glsl/"
 static const char *default_shader_dir = NULL;
 #endif
 
+#if defined(__QNX__)
+static const char *default_config_path = "app/native/retroarch.cfg";
+#else
+static const char *default_config_path = NULL;
+#endif
+
 #if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI)
 static bool default_block_config_read = true;
 #else
diff --git a/frontend/platform/platform_qnx.c b/frontend/platform/platform_qnx.c
index d0864d7a0d..a531f616c9 100644
--- a/frontend/platform/platform_qnx.c
+++ b/frontend/platform/platform_qnx.c
@@ -31,9 +31,6 @@ static void get_environment_settings(int argc, char *argv[], void *args)
 /* FIXME - should this apply for both BB10 and PB? */
 #if defined(__QNX__) && !defined(HAVE_BB10)
    rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)"app/native/lib");
-
-   strlcpy(g_extern.config_path, "app/native/retroarch.cfg", sizeof(g_extern.config_path));
-   strlcpy(g_settings.video.shader_dir, "app/native/shaders_glsl", sizeof(g_settings.video.shader_dir));
 #endif
 
    config_load();
diff --git a/settings.c b/settings.c
index 6fc5e2df11..249f854f86 100644
--- a/settings.c
+++ b/settings.c
@@ -350,6 +350,9 @@ void config_set_defaults(void)
    if (default_libretro_info_path)
       strlcpy(g_settings.libretro_info_path, default_libretro_info_path, sizeof(g_settings.libretro_info_path));
 
+   if (default_config_path)
+      strlcpy(g_extern.config_path, default_config_path, sizeof(g_extern.config_path));
+
    g_extern.config_save_on_exit = config_save_on_exit;
 
    /* Avoid reloading config on every ROM load */