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

* Moved check for DML to top of the initialization to ensure the check is done on real nand

Browse Source
This commit is contained in:
overjoy.psm 2012-01-28 20:09:34 +00:00
parent 85e5e4c815
commit a9486b79bf
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/menu/menu.cpp
View File

@ -186,6 +186,8 @@ void CMenu::init(void)
return; return;
} }
} }
m_show_dml = MIOSisDML();
Nand::Instance()->Init(m_cfg.getString("NAND", "path", "").c_str(), Nand::Instance()->Init(m_cfg.getString("NAND", "path", "").c_str(),
m_cfg.getInt("NAND", "partition", 0), m_cfg.getInt("NAND", "partition", 0),
m_cfg.getBool("NAND", "disable", true) m_cfg.getBool("NAND", "disable", true)
@ -1840,7 +1842,7 @@ bool CMenu::MIOSisDML()
} }
} }
} }
gprintf( "MIOSisDML: No!\n" ); gprintf( "MIOSisDML: No!\n" );
SAFE_FREE(TMD); SAFE_FREE(TMD);
return false; return false;
} }

1
source/menu/menu.hpp
View File

@ -158,6 +158,7 @@ private:
u32 m_mainBtnInit2; u32 m_mainBtnInit2;
u32 m_mainLblInit; u32 m_mainLblInit;
u32 m_mainLblUser[6]; u32 m_mainLblUser[6];
bool m_show_dml;
//Main Config menus //Main Config menus
u32 m_configLblPage; u32 m_configLblPage;
u32 m_configBtnPageM; u32 m_configBtnPageM;

16
source/menu/menu_main.cpp
View File

@ -73,7 +73,6 @@ void CMenu::_hideMain(bool instant)
static bool show_homebrew = true; static bool show_homebrew = true;
static bool parental_homebrew = false; static bool parental_homebrew = false;
static bool show_dml = false;
void CMenu::_showMain(void) void CMenu::_showMain(void)
{ {
@ -91,7 +90,7 @@ void CMenu::_showMain(void)
switch(m_current_view) switch(m_current_view)
{ {
case COVERFLOW_HOMEBREW: case COVERFLOW_HOMEBREW:
if( show_dml ) if( m_show_dml )
m_btnMgr.show(m_mainBtnDML); m_btnMgr.show(m_mainBtnDML);
else else
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
@ -99,7 +98,7 @@ void CMenu::_showMain(void)
case COVERFLOW_CHANNEL: case COVERFLOW_CHANNEL:
if(show_homebrew) if(show_homebrew)
m_btnMgr.show(m_mainBtnHomebrew); m_btnMgr.show(m_mainBtnHomebrew);
else if( show_dml ) else if( m_show_dml )
m_btnMgr.show(m_mainBtnDML); m_btnMgr.show(m_mainBtnDML);
else else
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
@ -164,8 +163,7 @@ int CMenu::main(void)
string prevTheme = m_cfg.getString("GENERAL", "theme", "default"); string prevTheme = m_cfg.getString("GENERAL", "theme", "default");
bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false); bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false);
show_homebrew = !m_cfg.getBool("HOMEBREW", "disable", false); show_homebrew = !m_cfg.getBool("HOMEBREW", "disable", false);
parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false); parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false);
show_dml = MIOSisDML();
m_reload = false; m_reload = false;
static u32 disc_check = 0; static u32 disc_check = 0;
@ -479,9 +477,9 @@ int CMenu::main(void)
if (m_current_view == COVERFLOW_USB) if (m_current_view == COVERFLOW_USB)
m_current_view = COVERFLOW_CHANNEL; m_current_view = COVERFLOW_CHANNEL;
else if (m_current_view == COVERFLOW_CHANNEL) else if (m_current_view == COVERFLOW_CHANNEL)
m_current_view = (show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : ( show_dml ? COVERFLOW_DML : COVERFLOW_USB ); m_current_view = (show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : ( m_show_dml ? COVERFLOW_DML : COVERFLOW_USB );
else if (m_current_view == COVERFLOW_HOMEBREW) else if (m_current_view == COVERFLOW_HOMEBREW)
m_current_view = show_dml ? COVERFLOW_DML : COVERFLOW_USB; m_current_view = m_show_dml ? COVERFLOW_DML : COVERFLOW_USB;
else if (m_current_view == COVERFLOW_DML) else if (m_current_view == COVERFLOW_DML)
m_current_view = COVERFLOW_USB; m_current_view = COVERFLOW_USB;
@ -604,7 +602,7 @@ int CMenu::main(void)
switch(m_current_view) switch(m_current_view)
{ {
case COVERFLOW_HOMEBREW: case COVERFLOW_HOMEBREW:
if( show_dml ) if( m_show_dml )
m_btnMgr.show(m_mainBtnDML); m_btnMgr.show(m_mainBtnDML);
else else
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
@ -612,7 +610,7 @@ int CMenu::main(void)
case COVERFLOW_CHANNEL: case COVERFLOW_CHANNEL:
if (show_homebrew && (parental_homebrew || !m_locked)) if (show_homebrew && (parental_homebrew || !m_locked))
m_btnMgr.show(m_mainBtnHomebrew); m_btnMgr.show(m_mainBtnHomebrew);
else if( show_dml ) else if( m_show_dml )
m_btnMgr.show(m_mainBtnDML); m_btnMgr.show(m_mainBtnDML);
else else
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);