diff --git a/out/bins/app_booter.bin b/out/bins/app_booter.bin index 3269cc1d..5427c7f4 100644 Binary files a/out/bins/app_booter.bin and b/out/bins/app_booter.bin differ diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin index 0c857595..fe996a44 100644 Binary files a/out/bins/ext_booter.bin and b/out/bins/ext_booter.bin differ diff --git a/out/boot.dol b/out/boot.dol index ffe90f7c..a187cfaf 100644 Binary files a/out/boot.dol and b/out/boot.dol differ diff --git a/source/gc/gcdisc.cpp b/source/gc/gcdisc.cpp index de1f665f..578748ee 100644 --- a/source/gc/gcdisc.cpp +++ b/source/gc/gcdisc.cpp @@ -103,7 +103,7 @@ void GC_Disc::Read_FST(FILE *f, u32 FST_size) u8 *GC_Disc::GetGameCubeBanner() { - if(FSTable == NULL || GamePath == NULL) + if(FSTable == NULL || strlen(GamePath) == 0) return NULL; FILE *bnr_fp = NULL; diff --git a/source/gui/text.cpp b/source/gui/text.cpp index 369410f9..d3057bcf 100644 --- a/source/gui/text.cpp +++ b/source/gui/text.cpp @@ -423,18 +423,18 @@ string lowerCase(string text) } // trim from start -string ltrim(string s) +/*string ltrim(string s) { s.erase(s.begin(), find_if(s.begin(), s.end(), std::not1(std::ptr_fun(isspace)))); return s; } - +*/ // trim from end -string rtrim(string s) +/*string rtrim(string s) { s.erase(find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun(isspace))).base(), s.end()); return s; -} +}*/ bool wchar_cmp(const wchar_t *first, const wchar_t *second, u32 first_len, u32 second_len) { diff --git a/source/gui/text.hpp b/source/gui/text.hpp index b86e040f..e1f75e0f 100644 --- a/source/gui/text.hpp +++ b/source/gui/text.hpp @@ -69,8 +69,8 @@ vector stringToVector(const wstringEx &text, char sep); vector stringToVector(const string &text, char sep); string upperCase(string text); string lowerCase(string text); -string ltrim(string s); -string rtrim(string s); +//string ltrim(string s); +//string rtrim(string s); bool wchar_cmp(const wchar_t *first, const wchar_t *second, u32 first_len, u32 second_len); bool char_cmp(const char *first, const char *second, u32 first_len, u32 second_len); diff --git a/source/list/ListGenerator.cpp b/source/list/ListGenerator.cpp index bcd68d50..2e88986c 100644 --- a/source/list/ListGenerator.cpp +++ b/source/list/ListGenerator.cpp @@ -217,7 +217,7 @@ static void Create_Channel_List() for(u32 i = 0; i < ChannelHandle.Count(); i++) { chan = ChannelHandle.GetChannel(i); - if(chan->id == NULL) + if(strlen(chan->id) == 0) continue; // Skip invalid channels memset((void*)&ListElement, 0, sizeof(dir_discHdr)); ListElement.index = m_cacheList.size(); diff --git a/source/menu/menu_game_boot.cpp b/source/menu/menu_game_boot.cpp index f9d7ba85..4f0b9cf1 100644 --- a/source/menu/menu_game_boot.cpp +++ b/source/menu/menu_game_boot.cpp @@ -1,6 +1,7 @@ #include #include +#include #include "menu.hpp" #include "types.h" @@ -259,6 +260,10 @@ void CMenu::_launchPlugin(dir_discHdr *hdr) } } + /* date fixes for specific plugins */ + if(hdr->settings[0] == 1414875969) //wiituka + settime(637962048000000000);// Aug 16, 2022 + /* launch plugin with args */ gprintf("launching plugin app\n"); _launchHomebrew(plugin_file, arguments); diff --git a/source/menu/menu_nandemu.cpp b/source/menu/menu_nandemu.cpp index 584c9b64..58555115 100644 --- a/source/menu/menu_nandemu.cpp +++ b/source/menu/menu_nandemu.cpp @@ -74,12 +74,12 @@ void CMenu::_showNandEmu(void) if(nandemuPage == 1) { - m_btnMgr.setText(m_configLbl1Val, m_cfg.getString(WII_DOMAIN, "current_save_emunand")); + m_btnMgr.setText(m_configLbl1Val, m_cfg.getString(CHANNEL_DOMAIN, "current_emunand")); int i = min(max(0, m_cfg.getInt(CHANNEL_DOMAIN, "emulation", 0)), (int)ARRAY_SIZE(CMenu::_NandEmu) - 1); m_btnMgr.setText(m_configLbl2Val, _t(CMenu::_NandEmu[i].id, CMenu::_NandEmu[i].text)); - m_btnMgr.setText(m_configLbl3Val, m_cfg.getString(CHANNEL_DOMAIN, "current_emunand")); + m_btnMgr.setText(m_configLbl3Val, m_cfg.getString(WII_DOMAIN, "current_save_emunand")); i = min(max(0, m_cfg.getInt(WII_DOMAIN, "save_emulation", 0)), (int)ARRAY_SIZE(CMenu::_GlobalSaveEmu) - 1); m_btnMgr.setText(m_configLbl4Val, _t(CMenu::_GlobalSaveEmu[i].id, CMenu::_GlobalSaveEmu[i].text)); diff --git a/source/music/MusicPlayer.cpp b/source/music/MusicPlayer.cpp index 1e6cbb8c..c135124e 100644 --- a/source/music/MusicPlayer.cpp +++ b/source/music/MusicPlayer.cpp @@ -96,7 +96,10 @@ int Musicplayer::InitPlaylist(Config &cfg, const char *playlist, u8 device) if(song.find(".mp3") == string::npos && song.find(".ogg") == string::npos)// if not song path continue to next line continue; while(song.find("\\") != string::npos)// convert all '\' to '/' - song.replace(song.find("\\"), 1, "/"); + { + //song.replace(song.find("\\"), 1, "/"); + song[song.find("\\")] = '/'; + } string::size_type p = song.find("/");// remove drive letter and anything else before first / song.erase(0, p); const char *songPath = fmt("%s:%s", DeviceName[device], song.c_str());