The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2025-01-23 09:11:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

-fix for return to channel setting on pg 4 of main settings. now it works even in emu nand channels view.

Browse Source
This commit is contained in:
fledge68 2016-04-13 16:47:25 +00:00
parent 0eb210b7fa
commit 140999c2e3
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
out/boot.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

23
source/menu/menu_config4.cpp
View File

@ -71,12 +71,11 @@ void CMenu::_showConfig4(void)
titles.load(fmt("%s/" TITLES_FILENAME, m_settingsDir.c_str())); titles.load(fmt("%s/" TITLES_FILENAME, m_settingsDir.c_str()));
custom_titles.load(fmt("%s/" CTITLES_FILENAME, m_settingsDir.c_str())); custom_titles.load(fmt("%s/" CTITLES_FILENAME, m_settingsDir.c_str()));
wstringEx channelName = m_loc.getWString(m_curLanguage, "disabled", L"Disabled");
ChannelHandle.Init(m_loc.getString(m_curLanguage, "gametdb_code", "EN")); ChannelHandle.Init(m_loc.getString(m_curLanguage, "gametdb_code", "EN"));
amountOfChannels = ChannelHandle.Count(); amountOfChannels = ChannelHandle.Count();
wstringEx channelName = m_loc.getWString(m_curLanguage, "disabled", L"Disabled");
const string &currentChanId = m_cfg.getString("GENERAL", "returnto"); const string &currentChanId = m_cfg.getString("GENERAL", "returnto");
currentChannelIndex = -1;
if(!currentChanId.empty()) if(!currentChanId.empty())
{ {
for(int i = 0; i < amountOfChannels; i++) for(int i = 0; i < amountOfChannels; i++)
@ -84,6 +83,7 @@ void CMenu::_showConfig4(void)
if(strncmp(currentChanId.c_str(), ChannelHandle.GetId(i), 4) == 0) if(strncmp(currentChanId.c_str(), ChannelHandle.GetId(i), 4) == 0)
{ {
channelName = custom_titles.getWString("TITLES", currentChanId, titles.getWString("TITLES", currentChanId, ChannelHandle.GetName(i))); channelName = custom_titles.getWString("TITLES", currentChanId, titles.getWString("TITLES", currentChanId, ChannelHandle.GetName(i)));
currentChannelIndex = i;
break; break;
} }
} }
@ -94,7 +94,8 @@ void CMenu::_showConfig4(void)
int CMenu::_config4(void) int CMenu::_config4(void)
{ {
int change = CONFIG_PAGE_NO_CHANGE; int change = CONFIG_PAGE_NO_CHANGE;
bool curNANDemuView = NANDemuView;
NANDemuView = false;
_showConfig4(); _showConfig4();
while(!m_exit) while(!m_exit)
{ {
@ -124,25 +125,25 @@ int CMenu::_config4(void)
} }
else if (m_btnMgr.selected(m_config4BtnReturnToP)) else if (m_btnMgr.selected(m_config4BtnReturnToP))
{ {
currentChannelIndex = (currentChannelIndex >= amountOfChannels - 1) ? -1 : currentChannelIndex + 1; if(currentChannelIndex >= (amountOfChannels - 1))
if (currentChannelIndex == -1)
m_cfg.remove("GENERAL", "returnto"); m_cfg.remove("GENERAL", "returnto");
else else
m_cfg.setString("GENERAL", "returnto", ChannelHandle.GetId(currentChannelIndex)); m_cfg.setString("GENERAL", "returnto", ChannelHandle.GetId(currentChannelIndex + 1));
_showConfig4(); _showConfig4();
} }
else if (m_btnMgr.selected(m_config4BtnReturnToM)) else if (m_btnMgr.selected(m_config4BtnReturnToM))
{ {
if (currentChannelIndex == -1) currentChannelIndex = amountOfChannels; if(currentChannelIndex == -1)
currentChannelIndex--; currentChannelIndex = amountOfChannels;
if (currentChannelIndex == -1) if((currentChannelIndex - 1) == -1)
m_cfg.remove("GENERAL", "returnto"); m_cfg.remove("GENERAL", "returnto");
else else
m_cfg.setString("GENERAL", "returnto", ChannelHandle.GetId(currentChannelIndex)); m_cfg.setString("GENERAL", "returnto", ChannelHandle.GetId(currentChannelIndex - 1));
_showConfig4(); _showConfig4();
} }
} }
} }
NANDemuView = curNANDemuView;
_hideConfig4(); _hideConfig4();
return change; return change;
} }