mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-12-24 10:51:55 +01:00
-changed some really stupid bool for d2x v8
This commit is contained in:
parent
c921214cc4
commit
8c18d1fa3c
@ -186,14 +186,14 @@ int CMenu::_config1(void)
|
|||||||
bool disable = m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true);
|
bool disable = m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true);
|
||||||
if(!disable)
|
if(!disable)
|
||||||
{
|
{
|
||||||
bool isD2Xv7 = IOS_GetRevision() % 100 == 7;
|
bool isD2XnewerThanV6 = IOS_GetRevision() % 100 > 6;
|
||||||
u8 limiter = 0;
|
u8 limiter = 0;
|
||||||
s8 direction = m_btnMgr.selected(m_configBtnPartitionP) ? 1 : -1;
|
s8 direction = m_btnMgr.selected(m_configBtnPartitionP) ? 1 : -1;
|
||||||
currentPartition = loopNum(currentPartition + direction, (int)USB8);
|
currentPartition = loopNum(currentPartition + direction, (int)USB8);
|
||||||
while(!DeviceHandler::Instance()->IsInserted(currentPartition) ||
|
while(!DeviceHandler::Instance()->IsInserted(currentPartition) ||
|
||||||
(m_current_view == COVERFLOW_CHANNEL && (DeviceHandler::Instance()->GetFSType(currentPartition) != PART_FS_FAT ||
|
(m_current_view == COVERFLOW_CHANNEL && (DeviceHandler::Instance()->GetFSType(currentPartition) != PART_FS_FAT ||
|
||||||
(!isD2Xv7 && DeviceHandler::Instance()->PathToDriveType(m_appDir.c_str()) == currentPartition) ||
|
(!isD2XnewerThanV6 && DeviceHandler::Instance()->PathToDriveType(m_appDir.c_str()) == currentPartition) ||
|
||||||
(!isD2Xv7 && DeviceHandler::Instance()->PathToDriveType(m_dataDir.c_str()) == currentPartition))) ||
|
(!isD2XnewerThanV6 && DeviceHandler::Instance()->PathToDriveType(m_dataDir.c_str()) == currentPartition))) ||
|
||||||
(m_current_view == COVERFLOW_HOMEBREW && DeviceHandler::Instance()->GetFSType(currentPartition) == PART_FS_WBFS))
|
(m_current_view == COVERFLOW_HOMEBREW && DeviceHandler::Instance()->GetFSType(currentPartition) == PART_FS_WBFS))
|
||||||
{
|
{
|
||||||
currentPartition = loopNum(currentPartition + direction, (int)USB8);
|
currentPartition = loopNum(currentPartition + direction, (int)USB8);
|
||||||
|
@ -329,13 +329,13 @@ int CMenu::main(void)
|
|||||||
_showWaitMessage();
|
_showWaitMessage();
|
||||||
_hideMain();
|
_hideMain();
|
||||||
|
|
||||||
bool isD2Xv7 = IOS_GetRevision() % 100 == 7;
|
bool isD2XnewerThanV6 = IOS_GetRevision() % 100 > 6;
|
||||||
u8 limiter = 0;
|
u8 limiter = 0;
|
||||||
currentPartition = loopNum(currentPartition + 1, (int)USB8);
|
currentPartition = loopNum(currentPartition + 1, (int)USB8);
|
||||||
while(!DeviceHandler::Instance()->IsInserted(currentPartition) ||
|
while(!DeviceHandler::Instance()->IsInserted(currentPartition) ||
|
||||||
(m_current_view == COVERFLOW_CHANNEL && (DeviceHandler::Instance()->GetFSType(currentPartition) != PART_FS_FAT ||
|
(m_current_view == COVERFLOW_CHANNEL && (DeviceHandler::Instance()->GetFSType(currentPartition) != PART_FS_FAT ||
|
||||||
(!isD2Xv7 && DeviceHandler::Instance()->PathToDriveType(m_appDir.c_str()) == currentPartition) ||
|
(!isD2XnewerThanV6 && DeviceHandler::Instance()->PathToDriveType(m_appDir.c_str()) == currentPartition) ||
|
||||||
(!isD2Xv7 && DeviceHandler::Instance()->PathToDriveType(m_dataDir.c_str()) == currentPartition))) ||
|
(!isD2XnewerThanV6 && DeviceHandler::Instance()->PathToDriveType(m_dataDir.c_str()) == currentPartition))) ||
|
||||||
(m_current_view == COVERFLOW_HOMEBREW && DeviceHandler::Instance()->GetFSType(currentPartition) == PART_FS_WBFS))
|
(m_current_view == COVERFLOW_HOMEBREW && DeviceHandler::Instance()->GetFSType(currentPartition) == PART_FS_WBFS))
|
||||||
{
|
{
|
||||||
currentPartition = loopNum(currentPartition + 1, (int)USB8);
|
currentPartition = loopNum(currentPartition + 1, (int)USB8);
|
||||||
|
Loading…
Reference in New Issue
Block a user