-completely disabled CheckWaitThread now since it only makes problems

-changed version naming scheme, looks like "WiiFlow (Mod 3.0-r154)" with this version
This commit is contained in:
fix94.1 2012-02-23 17:14:42 +00:00
parent 62e74cd771
commit 4d9cba851c
5 changed files with 6 additions and 6 deletions

View File

@ -1,5 +1,5 @@
#define APP_NAME "WiiFlow"
#define APP_VERSION "3.1 Alpha"
#define APP_VERSION "Mod 3.0"
#define APPDATA_DIR "wiiflow"
#define APPDATA_DIR2 "apps/wiiflow"

View File

@ -519,7 +519,7 @@ void CVideo::_showWaitMessages(CVideo *m)
m->m_waitMessages.clear();
//gprintf("Stop showing images\n");
m->m_showingWaitMessages = false;
m->CheckWaitThread(false);
//m->CheckWaitThread(false);
gprintf("Stop showing images\n");
}
@ -598,7 +598,7 @@ void CVideo::waitMessage(const safe_vector<STexture> &tex, float delay, bool use
SMART_FREE(waitThreadStack);
waitThreadStack = SmartBuf((unsigned char *)__real_malloc(stack_size), SmartBuf::SRCALL_MALLOC);
waitThreadStack = smartMem2Alloc(stack_size);
LWP_CreateThread(&waitThread, (void *(*)(void *))CVideo::_showWaitMessages, (void *)this, waitThreadStack.get(), stack_size, 30);
LWP_CreateThread(&waitThread, (void *(*)(void *))CVideo::_showWaitMessages, (void *)this, waitThreadStack.get(), stack_size, 0);
}
}

View File

@ -29,7 +29,7 @@ int main(int argc, char **argv)
geckoinit = InitGecko();
__exception_setreload(5);
gprintf(" \nWelcome to %s %s r%s!\nThis is the debug output.\n", APP_NAME, APP_VERSION, SVN_REV);
gprintf(" \nWelcome to %s (%s-r%s)!\nThis is the debug output.\n", APP_NAME, APP_VERSION, SVN_REV);
SYS_SetArena1Hi(APPLOADER_START);
CVideo vid;

View File

@ -123,7 +123,7 @@ void CMenu::_initAboutMenu(CMenu::SThemeData &theme)
void CMenu::_textAbout(void)
{
m_btnMgr.setText(m_aboutBtnSystem, _t("sys4", L"Update"));
m_btnMgr.setText(m_aboutLblTitle, wfmt(_fmt("appname", L"%s v%s r%s"), APP_NAME, APP_VERSION, SVN_REV), false);
m_btnMgr.setText(m_aboutLblTitle, wfmt(_fmt("appname", L"%s (%s-r%s)"), APP_NAME, APP_VERSION, SVN_REV), false);
wstringEx developers(wfmt(_fmt("about6", L"\nCurrent Developers:\n%s"), DEVELOPERS));
wstringEx pDevelopers(wfmt(_fmt("about7", L"Past Developers:\n%s"), PAST_DEVELOPERS));

View File

@ -249,7 +249,7 @@ void CMenu::_textSystem(void)
{
m_btnMgr.setText(m_systemLblTitle, _t("sys1", L"Update WiiFlow"));
m_btnMgr.setText(m_systemLblVersionTxt, _t("sys2", L"WiiFlow Version:"));
m_btnMgr.setText(m_systemLblVersion, wfmt(L"v%s r%s", APP_VERSION, SVN_REV).c_str());
m_btnMgr.setText(m_systemLblVersion, wfmt(L"(%s-r%s)", APP_VERSION, SVN_REV).c_str());
m_btnMgr.setText(m_systemBtnBack, _t("sys3", L"Cancel"));
m_btnMgr.setText(m_systemBtnDownload, _t("sys4", L"Upgrade"));
i = min((u32)version_num, ARRAY_SIZE(CMenu::_version) -1u);