From 311249f52142085bfc921864662721979d29ba07 Mon Sep 17 00:00:00 2001
From: KrahJohlito <KrahJohlito@outlook.com>
Date: Sun, 16 Dec 2018 09:46:13 +1030
Subject: [PATCH] remove saving cfg when loading hdl svr, as it does not fix
 the root of the problem

---
 include/lang.h |  1 -
 src/lang.c     |  1 -
 src/menusys.c  | 12 +++---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/include/lang.h b/include/lang.h
index 5b1398f81..4c032aac1 100644
--- a/include/lang.h
+++ b/include/lang.h
@@ -260,7 +260,6 @@ enum _STR_IDS {
     _STR_BUILD_DETAILS,
     _STR_PARENLOCK_INVALID_PASSWORD,
     _STR_ERR_VMC_FRAGMENTED_CONTINUE,
-    _STR_HDL_SAVE_SETTINGS,
     _STR_AUDIO_SETTINGS,
     _STR_SFX,
     _STR_BOOT_SND,
diff --git a/src/lang.c b/src/lang.c
index 576fcc345..91dd19c65 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -268,7 +268,6 @@ static char *internalEnglish[LANG_STR_COUNT] = {
     "Build Options:",
     "Error - this password cannot be used.",
     "VMC %s file is fragmented. Continue with Memory Card in slot %d?",
-    "Settings must be saved before continuing.",
     "Audio Settings",
     "Enable Sound Effects",
     "Enable Boot Sound",
diff --git a/src/menusys.c b/src/menusys.c
index a1718aa79..d8bca5048 100644
--- a/src/menusys.c
+++ b/src/menusys.c
@@ -733,16 +733,10 @@ void menuHandleInputMenu()
               menuSetParentalLockCheckState(1); //Re-enable parental lock check.
             }
         } else if (id == MENU_START_HDL) {
-            if (menuCheckParentalLock() == 0) {
-                int ret = guiMsgBox(_l(_STR_HDL_SAVE_SETTINGS), 1, NULL);
-                if (ret != 0) {
-                    saveConfig(CONFIG_OPL | CONFIG_NETWORK, 1);
-                    menuSetParentalLockCheckState(1); //Re-enable parental lock check.
-                    handleHdlSrv();
-                }
-            }
+            if (menuCheckParentalLock() == 0)
+              handleHdlSrv();
         } else if (id == MENU_ABOUT) {
-            guiShowAbout();
+              guiShowAbout();
         } else if (id == MENU_EXIT) {
             if (guiMsgBox(_l(_STR_CONFIRMATION_EXIT), 1, NULL))
                 sysExecExit();