- date patch for wiituka in menu_game_boot.cpp

- fixed nand selection i messed up a few commits back in menu_nanemu.cpp
- other minor coding fixes to compile with devkitppc r41-2 and libogc 2.3.1-1

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;

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<int, int>(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<int, int>(isspace))).base(), s.end());
 	return s;
-}
+}*/
 
 bool wchar_cmp(const wchar_t *first, const wchar_t *second, u32 first_len, u32 second_len)
 {

source/gui/text.hpp

@@ -69,8 +69,8 @@ vector<wstringEx> stringToVector(const wstringEx &text, char sep);
 vector<std::string> 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);
 

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();

source/menu/menu_game_boot.cpp

@@ -1,6 +1,7 @@
 
 #include <fcntl.h>
 #include <ogc/machine/processor.h>
+#include <ogc/lwp_watchdog.h>
 
 #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);

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));

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());