From 6f22ffa6f4592d20da5de166203bdf6f833497bc Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Wed, 10 Jun 2009 08:19:55 +0000
Subject: [PATCH] *Changed the OnScreenKeyboard to allow to remove "SD:/" now
 so you can just enter "USB:/" instead to use USB FAT/FAT32 for covers and
 stuff *Added USB Remount to SDCard Button

---
 source/Settings.cpp | 10 +++++-----
 source/menu.cpp     | 15 ++++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/source/Settings.cpp b/source/Settings.cpp
index d017962c..2b5371d9 100644
--- a/source/Settings.cpp
+++ b/source/Settings.cpp
@@ -1244,7 +1244,7 @@ int MenuSettings()
                                     w.Remove(&backBtn);
                                     char entered[43] = "";
                                     strncpy(entered, Settings.covers_path, sizeof(entered));
-                                    int result = OnScreenKeyboard(entered,43,4);
+                                    int result = OnScreenKeyboard(entered,43,0);
                                     w.Append(&optionBrowser2);
                                     w.Append(&backBtn);
                                     if ( result == 1 )
@@ -1270,7 +1270,7 @@ int MenuSettings()
                                     w.Remove(&backBtn);
                                     char entered[43] = "";
                                     strncpy(entered, Settings.disc_path, sizeof(entered));
-                                    int result = OnScreenKeyboard(entered, 43,4);
+                                    int result = OnScreenKeyboard(entered, 43,0);
                                     w.Append(&optionBrowser2);
                                     w.Append(&backBtn);
                                     if ( result == 1 )
@@ -1296,7 +1296,7 @@ int MenuSettings()
                                     w.Remove(&backBtn);
                                     char entered[43] = "";
                                     strncpy(entered, CFG.theme_path, sizeof(entered));
-                                    int result = OnScreenKeyboard(entered, 43,4);
+                                    int result = OnScreenKeyboard(entered, 43,0);
                                     HaltGui();
                                     w.RemoveAll();
                                     if ( result == 1 )
@@ -1353,7 +1353,7 @@ int MenuSettings()
                                     w.Remove(&backBtn);
                                     char entered[43] = "";
                                     strncpy(entered, Settings.titlestxt_path, sizeof(entered));
-                                    int result = OnScreenKeyboard(entered,43,4);
+                                    int result = OnScreenKeyboard(entered,43,0);
                                     w.Append(&optionBrowser2);
                                     w.Append(&backBtn);
                                     if ( result == 1 )
@@ -1384,7 +1384,7 @@ int MenuSettings()
                                     w.Remove(&backBtn);
                                     char entered[43] = "";
                                     strncpy(entered, Settings.update_path, sizeof(entered));
-                                    int result = OnScreenKeyboard(entered,43,4);
+                                    int result = OnScreenKeyboard(entered,43,0);
                                     w.Append(&optionBrowser2);
                                     w.Append(&backBtn);
                                     if ( result == 1 )
diff --git a/source/menu.cpp b/source/menu.cpp
index db75d5c7..7c052cbd 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -185,8 +185,8 @@ static int MenuDiscList()
 	int selectImg1 = 0;
 	char ID[4];
     char IDfull[7];
-	
-	
+
+
         datagB=0;
         int menu = MENU_NONE, dataef=0;
         char imgPath[100];
@@ -341,8 +341,8 @@ static int MenuDiscList()
         GuiButton gameInfo(0,0);
 		gameInfo.SetTrigger(&trig2);
 		gameInfo.SetSoundClick(&btnClick);
-	
-		
+
+
 		GuiImage wiiBtnImg(&dataID);
         wiiBtnImg.SetWidescreen(CFG.widescreen);
         GuiButton wiiBtn(&wiiBtnImg,&wiiBtnImg, 0, 4, 0, -10, &trigA, &btnSoundOver, &btnClick,0);
@@ -677,6 +677,7 @@ static int MenuDiscList()
 
                 else if(sdcardBtn.GetState() == STATE_CLICKED)
                 {
+                        USBDevice_Init()
                         SDCard_deInit();
                         SDCard_Init();
                         if (Settings.gameDisplay==list){
@@ -1067,7 +1068,7 @@ static int MenuDiscList()
 				struct discHdr *header = &gameList[selectImg1];
 					snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]);
 					snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
-	
+
 				choice = showGameInfo(IDfull, header->id);
 				if (choice>0){
 				gameInfo.ResetState();
@@ -1091,7 +1092,7 @@ static int MenuDiscList()
                 if (Settings.gameDisplay==list) {
                         //Get selected game under cursor
                         int selectimg;//, promptnumber;
-                        
+
                         selectimg = gameBrowser->GetSelectedOption();
                         gameSelected = gameBrowser->GetClickedOption();
 						selectImg1=selectimg;
@@ -1198,7 +1199,7 @@ static int MenuDiscList()
                                 }
                         }
                 }
-				
+
 				if ((gameSelected >= 0) && (gameSelected < (s32)gameCnt))
                 {
                         struct discHdr *header = &gameList[gameSelected];