From 8614c349f35831b395ce393380ad30875d67f9bf Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sun, 18 Aug 2013 14:00:18 +0200
Subject: [PATCH] Use correct overlay configs.

Saves input_overlay as well on exit.
---
 retroarch.cfg |  6 ++++++
 settings.c    | 13 ++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/retroarch.cfg b/retroarch.cfg
index 0e09db086e..dafd3b0847 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -210,6 +210,12 @@
 # Path to input overlay
 # input_overlay =
 
+# Overlay opacity
+# input_overlay_opacity = 1.0
+
+# Overlay scale
+# input_overlay_scale = 1.0
+
 # Enable input auto-detection. Will attempt to autoconfigure
 # joypads, Plug-and-Play style.
 # input_autodetect_enable = true
diff --git a/settings.c b/settings.c
index 4cfc84e2da..4b9dd32237 100644
--- a/settings.c
+++ b/settings.c
@@ -664,8 +664,9 @@ bool config_load_file(const char *path)
    if (!strcmp(g_extern.overlay_dir, "default"))
       *g_extern.overlay_dir = '\0';
 
-   CONFIG_GET_FLOAT(input.overlay_opacity, "overlay_opacity");
-   CONFIG_GET_FLOAT(input.overlay_scale, "overlay_scale");
+   CONFIG_GET_PATH(input.overlay, "input_overlay");
+   CONFIG_GET_FLOAT(input.overlay_opacity, "input_overlay_opacity");
+   CONFIG_GET_FLOAT(input.overlay_scale, "input_overlay_scale");
 #endif
 
    CONFIG_GET_BOOL(rewind_enable, "rewind_enable");
@@ -702,9 +703,6 @@ bool config_load_file(const char *path)
    CONFIG_GET_INT(input.turbo_period, "input_turbo_period");
    CONFIG_GET_INT(input.turbo_duty_cycle, "input_duty_cycle");
 
-   CONFIG_GET_PATH(input.overlay, "input_overlay");
-   CONFIG_GET_FLOAT(input.overlay_opacity, "input_overlay_opacity");
-   CONFIG_GET_FLOAT(input.overlay_scale, "input_overlay_scale");
    CONFIG_GET_BOOL(input.debug_enable, "input_debug_enable");
 
    CONFIG_GET_BOOL(input.autodetect_enable, "input_autodetect_enable");
@@ -1014,8 +1012,9 @@ bool config_save_file(const char *path)
    else
       config_set_string(conf, "overlay_directory", "default");
    
-   config_set_float(conf, "overlay_opacity", g_settings.input.overlay_opacity);
-   config_set_float(conf, "overlay_scale", g_settings.input.overlay_scale);
+   config_set_string(conf, "input_overlay", g_settings.input.overlay);
+   config_set_float(conf, "input_overlay_opacity", g_settings.input.overlay_opacity);
+   config_set_float(conf, "input_overlay_scale", g_settings.input.overlay_scale);
 #endif
 
 #ifdef ANDROID