- fixes for custom background code.

This commit is contained in:
Fledge68 2019-12-02 13:43:19 -06:00
parent 7e5627b3e0
commit d6d931c35a
3 changed files with 13 additions and 12 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 MiB

After

Width:  |  Height:  |  Size: 3.6 MiB

View File

@ -413,16 +413,16 @@ int CMenu::main(void)
{ {
if(m_sourceflow)//back a tier or exit sourceflow if(m_sourceflow)//back a tier or exit sourceflow
{ {
m_refreshGameList = true;
if(!_srcTierBack(false))// back a tier if(!_srcTierBack(false))// back a tier
{ {
// not back a tier - exit sourceflow and return to coverflow // not back a tier - exit sourceflow and return to coverflow
m_cfg.setString(SOURCEFLOW_DOMAIN, "numbers", sm_numbers_backup);// restore if no source chosen m_cfg.setString(SOURCEFLOW_DOMAIN, "numbers", sm_numbers_backup);// restore if no source chosen
m_cfg.setString(SOURCEFLOW_DOMAIN, "tiers", sm_tiers_backup); m_cfg.setString(SOURCEFLOW_DOMAIN, "tiers", sm_tiers_backup);
m_sourceflow = false;// if not back a tier then exit sourceflow m_sourceflow = false;// if not back a tier then exit sourceflow
_getCustomBgTex();
_setMainBg();
} }
_showCF(true); _getCustomBgTex();
_showMain();
continue; continue;
} }
else if(m_use_source)//if source_menu enabled else if(m_use_source)//if source_menu enabled
@ -430,17 +430,19 @@ int CMenu::main(void)
_hideMain(); _hideMain();
if(m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled", false))//if sourceflow show it if(m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled", false))//if sourceflow show it
{ {
m_refreshGameList = true;
sm_numbers_backup = m_cfg.getString(SOURCEFLOW_DOMAIN, "numbers");//backup for possible restore later sm_numbers_backup = m_cfg.getString(SOURCEFLOW_DOMAIN, "numbers");//backup for possible restore later
sm_tiers_backup = m_cfg.getString(SOURCEFLOW_DOMAIN, "tiers"); sm_tiers_backup = m_cfg.getString(SOURCEFLOW_DOMAIN, "tiers");
m_sourceflow = true; m_sourceflow = true;
_getCustomBgTex(); _getCustomBgTex();
_showCF(true); _showMain();
} }
else //show source menu else //show source menu
{ {
m_refreshGameList = _Source(); m_refreshGameList = _Source();
if(BTN_B_HELD) if(BTN_B_HELD)
bUsed = true; bUsed = true;
_getCustomBgTex();
_showMain(); _showMain();
} }
continue; continue;
@ -451,15 +453,15 @@ int CMenu::main(void)
{ {
if(m_sourceflow)//back to base tier or exit sourceflow if(m_sourceflow)//back to base tier or exit sourceflow
{ {
m_refreshGameList = true;
if(!_srcTierBack(true))// if already on base tier exit sourceflow if(!_srcTierBack(true))// if already on base tier exit sourceflow
{ {
m_cfg.setString(SOURCEFLOW_DOMAIN, "numbers", sm_numbers_backup);// restore if no source chosen m_cfg.setString(SOURCEFLOW_DOMAIN, "numbers", sm_numbers_backup);// restore if no source chosen
m_cfg.setString(SOURCEFLOW_DOMAIN, "tiers", sm_tiers_backup); m_cfg.setString(SOURCEFLOW_DOMAIN, "tiers", sm_tiers_backup);
m_sourceflow = false; m_sourceflow = false;
_getCustomBgTex();
_setMainBg();
} }
_showCF(true); _getCustomBgTex();
_showMain();
} }
else else
{ {
@ -600,10 +602,10 @@ int CMenu::main(void)
_hideMain(); _hideMain();
if(m_sourceflow) if(m_sourceflow)
{ {
m_refreshGameList = true;
_sourceFlow();// set the source selected _sourceFlow();// set the source selected
_getCustomBgTex(); _getCustomBgTex();
_setMainBg(); _showMain();
_showCF(true);
continue; continue;
} }
else else

View File

@ -207,9 +207,7 @@ bool CMenu::_srcTierBack(bool home)
} }
srcDomain = m_source.nextDomain().c_str(); srcDomain = m_source.nextDomain().c_str();
} }
if(m_sourceflow) if(!m_sourceflow)
_getCustomBgTex();
else
{ {
curPage = stoi(sm_numbers[sm_numbers.size() - 1]) / 12 + 1; curPage = stoi(sm_numbers[sm_numbers.size() - 1]) / 12 + 1;
numPages = (m_max_source_btn / 12) + 1; numPages = (m_max_source_btn / 12) + 1;
@ -332,6 +330,7 @@ bool CMenu::_Source()
channels_type = m_cfg.getInt(CHANNEL_DOMAIN, "channels_type", CHANNELS_REAL); channels_type = m_cfg.getInt(CHANNEL_DOMAIN, "channels_type", CHANNELS_REAL);
sm_numbers_backup = m_cfg.getString(SOURCEFLOW_DOMAIN, "numbers");//backup for possible restore later sm_numbers_backup = m_cfg.getString(SOURCEFLOW_DOMAIN, "numbers");//backup for possible restore later
sm_tiers_backup = m_cfg.getString(SOURCEFLOW_DOMAIN, "tiers"); sm_tiers_backup = m_cfg.getString(SOURCEFLOW_DOMAIN, "tiers");
sm_numbers.pop_back();
SetupInput(); SetupInput();
_showSource(); _showSource();