-added one more missing compiler directive from last commit.

-fix to keep blank source menu buttons from being added to source_menu.ini
This commit is contained in:
Fledge68 2018-11-05 05:46:35 -06:00
parent 143cb7e941
commit 2594e9505c
4 changed files with 8 additions and 15 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

View File

@ -153,7 +153,11 @@ void writeStub()
DCFlushRange((void*)0x80001800, StubSize);
/* And free the memory again */
#ifdef APP_WIIFLOW
if(Stub != wfstub_bin)
#else
if(Stub != stub_bin)
#endif
free(Stub);
}

View File

@ -106,7 +106,7 @@ void *light_loop()
if(timeoff.tv_nsec > 0)
wiiLightOff();
//nanosleep(&timeoff, NULL);
nanosleep(&timeon);
nanosleep(&timeoff);
}
return NULL;
}

View File

@ -801,24 +801,13 @@ void CMenu::_initSourceMenu()
int row;
int col;
const char *ImgName = NULL;
for(i = 0; i < 12; ++i)
{
TexData texConsoleImg;
TexData texConsoleImgs;
ImgName = m_source.getString(fmt("BUTTON_%i", i),"image", "").c_str();
if(TexHandle.fromImageFile(texConsoleImg, fmt("%s/%s", m_themeDataDir.c_str(), ImgName)) != TE_OK)
{
if(TexHandle.fromImageFile(texConsoleImg, fmt("%s/%s", m_sourceDir.c_str(), ImgName)) != TE_OK)
TexHandle.fromImageFile(texConsoleImg, fmt("%s/favoriteson.png", m_imgsDir.c_str()));
}
ImgName = m_source.getString(fmt("BUTTON_%i", i),"image_s", "").c_str();
if(TexHandle.fromImageFile(texConsoleImgs, fmt("%s/%s", m_themeDataDir.c_str(), ImgName)) != TE_OK)
{
if(TexHandle.fromImageFile(texConsoleImgs, fmt("%s/%s", m_sourceDir.c_str(), ImgName)) != TE_OK)
TexHandle.fromImageFile(texConsoleImgs, fmt("%s/favoritesons.png", m_imgsDir.c_str()));
}
// use favoriteson.png just to initialize the buttons
TexHandle.fromImageFile(texConsoleImg, fmt("%s/favoriteson.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texConsoleImgs, fmt("%s/favoritesons.png", m_imgsDir.c_str()));
row = i / 4;
col = i - (row * 4);