From a6e208eed8f70afd55f982e2b59a7cc9667bd69b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 23 Jun 2015 03:29:55 +0200
Subject: [PATCH] (Menu) reorder some entries

---
 menu/menu_hash.c    |  6 +++---
 menu/menu_hash.h    |  4 ++--
 menu/menu_setting.c | 23 ++++++++++++-----------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/menu/menu_hash.c b/menu/menu_hash.c
index d116159f83..293775e9ae 100644
--- a/menu/menu_hash.c
+++ b/menu/menu_hash.c
@@ -1141,7 +1141,7 @@ static const char *menu_hash_to_str_portuguese(uint32_t hash)
       case MENU_LABEL_VALUE_CLOSE_CONTENT:
          return "Descarregar Core"; /* FIXME */
       case MENU_LABEL_MANAGEMENT:
-         return "advanced_management";
+         return "database_settings";
       case MENU_LABEL_VALUE_MANAGEMENT:
          return "Gerenciamento Avançado";
       case MENU_LABEL_PERFORMANCE_COUNTERS:
@@ -2517,9 +2517,9 @@ static const char *menu_hash_to_str_english(uint32_t hash)
       case MENU_LABEL_VALUE_CLOSE_CONTENT:
          return "Close Content";
       case MENU_LABEL_MANAGEMENT:
-         return "advanced_management";
+         return "database_settings";
       case MENU_LABEL_VALUE_MANAGEMENT:
-         return "Advanced Management";
+         return "Database Settings";
       case MENU_LABEL_PERFORMANCE_COUNTERS:
          return "performance_counters";
       case MENU_LABEL_SAVE_STATE:
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index c70560527b..d1b971afe6 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -535,8 +535,8 @@ extern "C" {
 #define MENU_LABEL_VALUE_PERFORMANCE_COUNTERS                                  0x20eb18caU
 #define MENU_LABEL_CORE_LIST                                                   0xac9dbf00U
 #define MENU_LABEL_VALUE_CORE_LIST                                             0x0e17fd4eU
-#define MENU_LABEL_MANAGEMENT                                                  0x096d05b7U
-#define MENU_LABEL_VALUE_MANAGEMENT                                            0x9afd7e78U
+#define MENU_LABEL_MANAGEMENT                                                  0x2516c88aU
+#define MENU_LABEL_VALUE_MANAGEMENT                                            0x97001d0bU
 #define MENU_LABEL_OPTIONS                                                     0x2534f97eU
 #define MENU_LABEL_VALUE_OPTIONS                                               0x06795dffU
 #define MENU_LABEL_SETTINGS                                                    0xa5d1de15U
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index fd3c0147bd..73407288e4 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -3439,13 +3439,14 @@ static bool setting_append_list_main_menu_options(
          subgroup_info.name,
          parent_group);
 
+#ifdef HAVE_NETWORKING
    CONFIG_ACTION(
-         menu_hash_to_str(MENU_LABEL_MANAGEMENT),
-         menu_hash_to_str(MENU_LABEL_VALUE_MANAGEMENT),
+         menu_hash_to_str(MENU_LABEL_CORE_UPDATER_LIST),
+         menu_hash_to_str(MENU_LABEL_VALUE_CORE_UPDATER_LIST),
          group_info.name,
          subgroup_info.name,
          parent_group);
-   settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+#endif
 
    if (global->main_is_init && (global->core_type != CORE_TYPE_DUMMY))
    {
@@ -3474,6 +3475,14 @@ static bool setting_append_list_main_menu_options(
             parent_group);
    }
 
+   CONFIG_ACTION(
+         menu_hash_to_str(MENU_LABEL_MANAGEMENT),
+         menu_hash_to_str(MENU_LABEL_VALUE_MANAGEMENT),
+         group_info.name,
+         subgroup_info.name,
+         parent_group);
+   settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
+
    CONFIG_ACTION(
          menu_hash_to_str(MENU_LABEL_SYSTEM_INFORMATION),
          menu_hash_to_str(MENU_LABEL_VALUE_SYSTEM_INFORMATION),
@@ -3481,14 +3490,6 @@ static bool setting_append_list_main_menu_options(
          subgroup_info.name,
          parent_group);
 
-#ifdef HAVE_NETWORKING
-   CONFIG_ACTION(
-         menu_hash_to_str(MENU_LABEL_CORE_UPDATER_LIST),
-         menu_hash_to_str(MENU_LABEL_VALUE_CORE_UPDATER_LIST),
-         group_info.name,
-         subgroup_info.name,
-         parent_group);
-#endif
 
    if (global->perfcnt_enable)
    {