From efdb2ecd4b332fa9a63fa30944c45d7a83d15149 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 17 Aug 2015 16:24:46 +0200
Subject: [PATCH] Don't use menu_settings_apply_deferred anymore

---
 menu/menu_entry.c   |  2 --
 menu/menu_setting.c | 36 ++++++++++++++++++++++++------------
 menu/menu_setting.h |  2 --
 retroarch.c         |  2 --
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index 3279de99bf..bf506e43e9 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -43,7 +43,6 @@ int menu_entry_go_back(void)
    if (!menu_list)
       return -1;
 
-   menu_settings_apply_deferred();
    menu_list_pop_stack(menu_list);
 
    if (menu_entries_needs_refresh())
@@ -179,7 +178,6 @@ void menu_entry_set_bool_value(uint32_t i, bool value)
 {
    rarch_setting_t *setting = menu_entry_get_setting(i);
    setting_set_with_string_representation(setting, value ? "true" : "false");
-   menu_setting_apply_deferred(setting);
 }
 
 struct string_list *menu_entry_enum_values(uint32_t i)
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 03792d68d7..909859db8f 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -418,18 +418,6 @@ int menu_setting_apply_deferred(rarch_setting_t *setting)
    return 0;
 }
 
-void menu_settings_apply_deferred(void)
-{
-   rarch_setting_t *setting = menu_setting_get_ptr();
-    
-   if (!setting)
-      return;
-    
-   for (; setting->type != ST_NONE; setting++)
-      menu_setting_apply_deferred(setting);
-}
-
-
 /**
  * setting_reset_setting:
  * @setting            : pointer to setting
@@ -591,6 +579,8 @@ int setting_set_with_string_representation(rarch_setting_t* setting,
    if (setting->change_handler)
       setting->change_handler(setting);
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -980,6 +970,8 @@ static int setting_uint_action_left_default(void *data, bool wraparound)
          *setting->value.unsigned_integer = setting->min;
    }
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -1006,6 +998,8 @@ static int setting_uint_action_right_default(void *data, bool wraparound)
       }
    }
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -1026,6 +1020,8 @@ static int setting_fraction_action_left_default(
          *setting->value.fraction = setting->min;
    }
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -1053,6 +1049,8 @@ static int setting_fraction_action_right_default(
       }
    }
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -1072,6 +1070,8 @@ static int setting_string_action_left_driver(void *data,
 #endif
    }
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -1091,6 +1091,8 @@ static int setting_string_action_right_driver(void *data,
          find_first_driver(setting->name, setting->value.string, setting->size);
    }
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -1128,6 +1130,9 @@ static int setting_action_ok_bind_all_save_autoconfig(void *data, bool wraparoun
       rarch_main_msg_queue_push("Autoconf file saved successfully", 1, 100, true);
    else
       rarch_main_msg_queue_push("Error saving autoconf file", 1, 100, true);
+
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -1171,6 +1176,8 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound)
       }
    }
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -1195,6 +1202,7 @@ static int setting_action_ok_video_refresh_rate_auto(void *data, bool wraparound
    if (setting_generic_action_ok_default(setting, wraparound) != 0)
       return -1;
 
+
    return 0;
 }
 
@@ -1226,6 +1234,8 @@ static int setting_generic_action_ok_linefeed(void *data, bool wraparound)
    menu_input_key_start_line(setting->short_description,
          setting->name, 0, 0, cb);
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
@@ -1241,6 +1251,8 @@ static int setting_action_action_ok(void *data, bool wraparound)
    if (setting->cmd_trigger.idx != EVENT_CMD_NONE)
       event_command(setting->cmd_trigger.idx);
 
+   menu_setting_apply_deferred(setting);
+
    return 0;
 }
 
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index ce98bb2031..cb9a021465 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -218,8 +218,6 @@ typedef struct rarch_setting
 
 int menu_setting_apply_deferred(rarch_setting_t *setting);
 
-void menu_settings_apply_deferred(void);
-
 int menu_setting_set_flags(rarch_setting_t *setting);
 
 int menu_setting_generic(rarch_setting_t *setting, bool wraparound);
diff --git a/retroarch.c b/retroarch.c
index 7771071c71..c307e1c8e0 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1427,8 +1427,6 @@ void rarch_main_set_state(unsigned cmd)
          break;
       case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED:
 #ifdef HAVE_MENU
-         menu_settings_apply_deferred();
-
          menu_driver_toggle(false);
          menu_driver_unset_alive();