-lets really reboot wiiflow if we change a setting in the startup :P

This commit is contained in:
fix94.1 2013-02-14 21:50:46 +00:00
parent 0ce4e2c363
commit 8634f272ed
3 changed files with 12 additions and 7 deletions

View File

@ -972,7 +972,7 @@ private:
void _CategorySettings(bool fromGameSet = false); void _CategorySettings(bool fromGameSet = false);
bool _Home(); bool _Home();
bool _ExitTo(); bool _ExitTo();
void _Boot(); bool _Boot();
void _mainLoopCommon(bool withCF = false, bool adjusting = false); void _mainLoopCommon(bool withCF = false, bool adjusting = false);
public: public:
void directlaunch(const char *GameID); void directlaunch(const char *GameID);

View File

@ -61,7 +61,7 @@ static void hideBoot(bool instant)
m_btnMgr.hide(m_bootBtnUSBPort, instant); m_btnMgr.hide(m_bootBtnUSBPort, instant);
} }
void CMenu::_Boot(void) bool CMenu::_Boot(void)
{ {
SetupInput(); SetupInput();
u8 port = currentPort; u8 port = currentPort;
@ -112,13 +112,17 @@ void CMenu::_Boot(void)
u8 cur_ios = min(m_cfg.getInt("GENERAL", "force_cios_rev", 0), 254); u8 cur_ios = min(m_cfg.getInt("GENERAL", "force_cios_rev", 0), 254);
if(prev_load != cur_load || prev_ios != cur_ios) if(prev_load != cur_load || prev_ios != cur_ios)
InternalSave.SaveIOS(cur_ios, cur_load); InternalSave.SaveIOS(cur_ios, cur_load);
if(port != currentPort) if(port != currentPort)
{
InternalSave.SavePort(port); InternalSave.SavePort(port);
m_reload = true;
}
hideBoot(false); hideBoot(false);
if(prev_load != cur_load || prev_ios != cur_ios || port != currentPort)
{
m_exit = true;
m_reload = true;
return 1;
}
return 0;
} }
void CMenu::_refreshBoot(u8 port) void CMenu::_refreshBoot(u8 port)

View File

@ -117,7 +117,8 @@ int CMenu::_configAdv(void)
if(m_btnMgr.selected(m_configAdvBtnBootChange)) if(m_btnMgr.selected(m_configAdvBtnBootChange))
{ {
_hideConfigAdv(); _hideConfigAdv();
_Boot(); if(_Boot())
break; /* Settings changed */
_showConfigAdv(); _showConfigAdv();
} }
else if (m_btnMgr.selected(m_configAdvBtnCurThemeP) || m_btnMgr.selected(m_configAdvBtnCurThemeM)) else if (m_btnMgr.selected(m_configAdvBtnCurThemeP) || m_btnMgr.selected(m_configAdvBtnCurThemeM))