From bdfe98946293eba3fd735857b078c57f8a9b872c Mon Sep 17 00:00:00 2001
From: "fix94.1" <fix94.1@gmail.com>
Date: Sat, 19 May 2012 21:55:58 +0000
Subject: [PATCH] -fixed missing background music yet again @all other devs:
 Next time you add a new thing to menu.hpp see if it breaks background music
 first, thanks :P

---
 source/menu/menu.cpp         | 1 -
 source/menu/menu.hpp         | 1 -
 source/menu/menu_startup.cpp | 5 +++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
index a6e048ab..436f8292 100644
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@@ -345,7 +345,6 @@ void CMenu::init(void)
 
 	// INI files
 	m_cat.load(fmt("%s/" CAT_FILENAME, m_settingsDir.c_str()));
-	m_startup.load(fmt("%s/" STARTUP_FILENAME, m_settingsDir.c_str()));
 	string themeName = m_cfg.getString("GENERAL", "theme", "DEFAULT");
 	m_themeDataDir = sfmt("%s/%s", m_themeDir.c_str(), themeName.c_str());
 	m_theme.load(fmt("%s.ini", m_themeDataDir.c_str()));
diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp
index b878a994..b9014d18 100644
--- a/source/menu/menu.hpp
+++ b/source/menu/menu.hpp
@@ -65,7 +65,6 @@ private:
 	CachedList<dir_discHdr> m_gameList;
 	Config m_cfg;
 	Config m_loc;
-	Config m_startup;
 	Config m_cat;
 	Config m_gcfg1;
 	Config m_gcfg2;
diff --git a/source/menu/menu_startup.cpp b/source/menu/menu_startup.cpp
index 1df8297c..400365bd 100644
--- a/source/menu/menu_startup.cpp
+++ b/source/menu/menu_startup.cpp
@@ -3,6 +3,8 @@
 #include <string.h>
 #include <gccore.h>
 
+#include "defines.h"
+
 int Startup_curPage;
 u8 numPlugins;
 
@@ -16,6 +18,7 @@ u32 m_startupLblTitle;
 u32 m_startupBtnSource[20];
 u32 m_startupLblUser[4];
 STexture m_startupBg;
+Config m_startup;
 
 void CMenu::_hideStartup(bool instant)
 {
@@ -81,6 +84,8 @@ void CMenu::_Startup()
 {
 	DIR *pdir;
 	struct dirent *pent;
+	if(!m_startup.loaded())
+		m_startup.load(fmt("%s/%s", m_settingsDir.c_str(), STARTUP_FILENAME));
 
 	pdir = opendir(m_pluginsDir.c_str());
 	Config m_plugin_cfg;