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

- another mistake fix for config emu nand menu.

Browse Source
This commit is contained in:
Fledge68 2022-09-07 13:39:22 -05:00
parent 67dc2fa7fb
commit b71f76c72f
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
out/bins/ext_booter.bin
View File

Binary file not shown.

BIN
out/boot.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB

2
source/defines.h
View File

@ -1,6 +1,6 @@
#define APP_NAME "WiiFlow WFL" #define APP_NAME "WiiFlow WFL"
#define APP_VERSION "5.5.4 beta 1" #define APP_VERSION "5.5.4"
#define APP_DATA_DIR "wiiflow" #define APP_DATA_DIR "wiiflow"
#define APPS_DIR "apps/wiiflow" #define APPS_DIR "apps/wiiflow"

17
source/menu/menu_nandemu.cpp
View File

@ -217,26 +217,28 @@ int CMenu::_NandEmuCfg(void)
direction = m_btnMgr.selected(m_configBtn1P) ? 1 : -1; direction = m_btnMgr.selected(m_configBtn1P) ? 1 : -1;
curEmuNand = loopNum(curEmuNand + direction, emuNands.size()); curEmuNand = loopNum(curEmuNand + direction, emuNands.size());
m_cfg.setString(CHANNEL_DOMAIN, "current_emunand", emuNands[curEmuNand]); m_cfg.setString(CHANNEL_DOMAIN, "current_emunand", emuNands[curEmuNand]);
_showNandEmu(); m_btnMgr.setText(m_configLbl1Val, emuNands[curEmuNand]);
} }
else if(m_btnMgr.selected(m_configBtn2P) || m_btnMgr.selected(m_configBtn2M)) else if(m_btnMgr.selected(m_configBtn2P) || m_btnMgr.selected(m_configBtn2M))
{ {
direction = m_btnMgr.selected(m_configBtn2P) ? 1 : -1; direction = m_btnMgr.selected(m_configBtn2P) ? 1 : -1;
m_cfg.setInt(CHANNEL_DOMAIN, "emulation", loopNum(m_cfg.getInt(CHANNEL_DOMAIN, "emulation", 0) + direction, ARRAY_SIZE(CMenu::_NandEmu))); m_cfg.setInt(CHANNEL_DOMAIN, "emulation", loopNum(m_cfg.getInt(CHANNEL_DOMAIN, "emulation", 0) + direction, ARRAY_SIZE(CMenu::_NandEmu)));
_showNandEmu(); int i = min(max(0, m_cfg.getInt(CHANNEL_DOMAIN, "emulation", 0)), (int)ARRAY_SIZE(CMenu::_NandEmu) - 1);
m_btnMgr.setText(m_configLbl2Val, _t(CMenu::_NandEmu[i].id, CMenu::_NandEmu[i].text));
} }
else if(m_btnMgr.selected(m_configBtn3P) || m_btnMgr.selected(m_configBtn3M)) else if(m_btnMgr.selected(m_configBtn3P) || m_btnMgr.selected(m_configBtn3M))
{ {
direction = m_btnMgr.selected(m_configBtn3P) ? 1 : -1; direction = m_btnMgr.selected(m_configBtn3P) ? 1 : -1;
curSavesNand = loopNum(curSavesNand + direction, savesNands.size()); curSavesNand = loopNum(curSavesNand + direction, savesNands.size());
m_cfg.setString(WII_DOMAIN, "current_save_emunand", savesNands[curSavesNand]); m_cfg.setString(WII_DOMAIN, "current_save_emunand", savesNands[curSavesNand]);
_showNandEmu(); m_btnMgr.setText(m_configLbl3Val, savesNands[curSavesNand]);
} }
else if(m_btnMgr.selected(m_configBtn4P) || m_btnMgr.selected(m_configBtn4M)) else if(m_btnMgr.selected(m_configBtn4P) || m_btnMgr.selected(m_configBtn4M))
{ {
direction = m_btnMgr.selected(m_configBtn4P) ? 1 : -1; direction = m_btnMgr.selected(m_configBtn4P) ? 1 : -1;
m_cfg.setInt(WII_DOMAIN, "save_emulation", loopNum(m_cfg.getInt(WII_DOMAIN, "save_emulation", 0) + direction, ARRAY_SIZE(CMenu::_GlobalSaveEmu))); m_cfg.setInt(WII_DOMAIN, "save_emulation", loopNum(m_cfg.getInt(WII_DOMAIN, "save_emulation", 0) + direction, ARRAY_SIZE(CMenu::_GlobalSaveEmu)));
_showNandEmu(); int i = min(max(0, m_cfg.getInt(WII_DOMAIN, "save_emulation", 0)), (int)ARRAY_SIZE(CMenu::_GlobalSaveEmu) - 1);
m_btnMgr.setText(m_configLbl4Val, _t(CMenu::_GlobalSaveEmu[i].id, CMenu::_GlobalSaveEmu[i].text));
} }
} }
else if(nandemuPage == 2) else if(nandemuPage == 2)
@ -300,17 +302,18 @@ int CMenu::_NandEmuCfg(void)
_setPartition(direction); _setPartition(direction);
m_emuSaveNand = false; m_emuSaveNand = false;
_getEmuNands();// refresh emunands in case the partition was changed _getEmuNands();// refresh emunands in case the partition was changed
_showNandEmu(); const char *partitionname = DeviceName[m_cfg.getInt(WII_DOMAIN, "savepartition")];
m_btnMgr.setText(m_configLbl1Val, upperCase(partitionname));
} }
else if(m_btnMgr.selected(m_configBtn2)) else if(m_btnMgr.selected(m_configBtn2))
{ {
m_cfg.setBool(CHANNEL_DOMAIN, "real_nand_config", !m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_config")); m_cfg.setBool(CHANNEL_DOMAIN, "real_nand_config", !m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_config"));
_showNandEmu(); m_btnMgr.setText(m_configBtn2, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_config", false) ? _t("on", L"On") : _t("off", L"Off"));
} }
else if(m_btnMgr.selected(m_configBtn3)) else if(m_btnMgr.selected(m_configBtn3))
{ {
m_cfg.setBool(CHANNEL_DOMAIN, "real_nand_miis", !m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_miis")); m_cfg.setBool(CHANNEL_DOMAIN, "real_nand_miis", !m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_miis"));
_showNandEmu(); m_btnMgr.setText(m_configBtn3, m_cfg.getBool(CHANNEL_DOMAIN, "real_nand_miis", false) ? _t("on", L"On") : _t("off", L"Off"));
} }
} }
} }