-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
This commit is contained in:
fix94.1 2012-05-19 21:55:58 +00:00
parent 79a8eb64e7
commit bdfe989462
3 changed files with 5 additions and 2 deletions

View File

@ -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()));

View File

@ -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;

View File

@ -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;