diff --git a/source/defines.h b/source/defines.h index 4d56bebe..c9644246 100644 --- a/source/defines.h +++ b/source/defines.h @@ -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" diff --git a/source/gui/video.cpp b/source/gui/video.cpp index e1ecb549..0118b725 100644 --- a/source/gui/video.cpp +++ b/source/gui/video.cpp @@ -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 &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); } } diff --git a/source/main.cpp b/source/main.cpp index dbbf8d36..501ef8fe 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -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; diff --git a/source/menu/menu_about.cpp b/source/menu/menu_about.cpp index 47d81a9c..2c6b07cc 100644 --- a/source/menu/menu_about.cpp +++ b/source/menu/menu_about.cpp @@ -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)); diff --git a/source/menu/menu_system.cpp b/source/menu/menu_system.cpp index 263ce5ba..463a08d6 100644 --- a/source/menu/menu_system.cpp +++ b/source/menu/menu_system.cpp @@ -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);