From cfb976a35aae4712f24e31c29907402258091c73 Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Sat, 6 Jun 2009 18:54:31 +0000
Subject: [PATCH] *Fixed UnlockButton vanishing *Fixed Update SD bug (wrong
 message) *CHANGED STANDARD PASSWORT TO NOT SET AND STANDARD LOAD IN GODMODE
 IF NO PASSWORT SET

---
 source/Settings.cpp        | 3 +--
 source/SettingsPrompts.cpp | 1 +
 source/cfg.c               | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/Settings.cpp b/source/Settings.cpp
index 8a0c0aa5..dddf11ab 100644
--- a/source/Settings.cpp
+++ b/source/Settings.cpp
@@ -813,7 +813,6 @@ int MenuSettings()
                     w.Remove(&MainButton4);
                     titleTxt.SetText(LANGUAGE.Parentalcontrol);
                     exit = false;
-                    if(Settings.godmode)
                     options2.SetName(0, "Console");
                     options2.SetName(1, "%s", LANGUAGE.Password);
                     options2.SetName(2, "%s",LANGUAGE.Controllevel);
@@ -1341,7 +1340,7 @@ int MenuSettings()
                     w.Append(&optionBrowser2);
                     w.Append(&backBtn);
                     } else {
-                        WindowPrompt(LANGUAGE.NoSDcardinserted, LANGUAGE.InsertaSDCardtousethatoption, LANGUAGE.ok, 0,0,0);
+                        WindowPrompt(LANGUAGE.ConsoleLocked, LANGUAGE.UnlockConsoletousethisOption, LANGUAGE.ok, 0,0,0);
                     }
                     slidedirection = FADE;
                     pageToDisplay = 2;
diff --git a/source/SettingsPrompts.cpp b/source/SettingsPrompts.cpp
index e374b723..c289446f 100644
--- a/source/SettingsPrompts.cpp
+++ b/source/SettingsPrompts.cpp
@@ -248,6 +248,7 @@ bool MenuOGG()
     if(ret>=0) {
         choice = WindowPrompt(LANGUAGE.Setasbackgroundmusic,GetFileName(ret),LANGUAGE.Yes,LANGUAGE.No,0,0);
         if(choice == 1) {
+        StopOgg();
         snprintf(fullpath,150,"%s%s",Settings.oggload_path,GetFileName(ret));
         choice = bgMusic->PlayOggFile(fullpath);
         if(choice < 0) {
diff --git a/source/cfg.c b/source/cfg.c
index 1e1b61c2..3a20037f 100644
--- a/source/cfg.c
+++ b/source/cfg.c
@@ -231,8 +231,9 @@ void CFG_Default(int widescreen) // -1 = non forced Mode
 		snprintf(Settings.covers_path, sizeof(Settings.covers_path), "SD:/images/"); //default image path
 		snprintf(Settings.disc_path, sizeof(Settings.disc_path), "SD:/images/disc/");
 		snprintf(Settings.titlestxt_path, sizeof(Settings.titlestxt_path), "SD:/config/");//default path for disc images
-		snprintf(Settings.unlockCode, sizeof(Settings.unlockCode), "ab121b");		// default password
-		snprintf(Settings.language_path, sizeof(Settings.language_path), "SD:/config/language/");
+		char * empty = "";
+		snprintf(Settings.unlockCode, sizeof(Settings.unlockCode), empty);		// default password
+		snprintf(Settings.language_path, sizeof(Settings.language_path), "notset");
 		snprintf(Settings.languagefiles_path, sizeof(Settings.languagefiles_path), "SD:/config/language/");
 		snprintf(Settings.oggload_path, sizeof(Settings.oggload_path), "SD:/config/backgroundmusic/");
 		snprintf(Settings.update_path, sizeof(Settings.update_path), "SD:/apps/usbloader_gx/");
@@ -340,7 +341,9 @@ void Global_Default(void)
 	Settings.volume = 80;
 	Settings.sfxvolume = 80;
 	Settings.tooltips = TooltipsOn;
-	snprintf(Settings.unlockCode, sizeof(Settings.unlockCode), "ab121b");
+	char * empty = "";
+	snprintf(Settings.unlockCode, sizeof(Settings.unlockCode), empty);
+	Settings.godmode = 1;
 	Settings.parentalcontrol = 0;
 	Settings.cios = ios249;
 	Settings.xflip = no;