-fix cat_page return to wiiflow the correct way. just remember it won't work if you use the view switcher icon. it's a source menu thing only.

This commit is contained in:
fledge68 2013-10-30 13:07:59 +00:00
parent a411d35a42
commit e9c553de32
3 changed files with 7 additions and 11 deletions

View File

@ -548,6 +548,7 @@ void CMenu::_game(bool launch)
m_gcfg2.load(fmt("%s/" GAME_SETTINGS2_FILENAME, m_settingsDir.c_str()));
// change to current games partition and set last_view for recall later
m_cfg.setInt("GENERAL", "last_view", m_current_view);
m_cfg.setInt("GENERAL", "cat_startpage", m_catStartPage);
switch(hdr->type)
{
case TYPE_CHANNEL:

View File

@ -301,18 +301,15 @@ int CMenu::main(void)
m_cfg.setBool(WII_DOMAIN, "source", true);
}
m_current_view = m_last_view;
m_catStartPage = m_cfg.getInt("GENERAL", "cat_startpage", 1);
if(m_current_view != COVERFLOW_MAX)
m_cfg.remove("GENERAL", "last_view");
m_cfg.save();
if(m_current_view == COVERFLOW_MAX)
m_combined_view = true;
else
{
s8 lastSrc = m_cfg.getInt("GENERAL", "last_source_btn", -1);
if(lastSrc >= 0 )
m_catStartPage = m_source.getInt(fmt("BUTTON_%i", lastSrc), "cat_page", 1);
m_cfg.remove("GENERAL", "last_view");
m_cfg.remove("GENERAL", "cat_startpage");
}
m_cfg.setInt("GENERAL", "last_source_btn", -1);
else
m_combined_view = true;
m_cfg.save();
if(m_cfg.getBool("GENERAL", "update_cache", false))
UpdateCache();
LoadView();

View File

@ -266,7 +266,6 @@ void CMenu::_sourceFlow()
memset(btn_selected, 0, 256);
strncpy(btn_selected, fmt("BUTTON_%i", hdr->settings[0]), 255);
string source = m_source.getString(btn_selected, "source", "");
m_cfg.setInt("GENERAL", "last_source_btn", hdr->settings[0]);
_clearSources();
if(source == "wii")
{
@ -599,7 +598,6 @@ bool CMenu::_Source()
string source = m_source.getString(btn_selected, "source", "");
if(BTN_A_PRESSED)
{
m_cfg.setInt("GENERAL", "last_source_btn", i + j);
_clearSources();
exitSource = true;
m_catStartPage = 1;