small bugfixes

This commit is contained in:
dborth 2009-10-02 03:09:10 +00:00
parent 28718ab082
commit 0c9866bb66
5 changed files with 24 additions and 8 deletions

View File

@ -275,6 +275,12 @@ bool MakeFilePath(char filepath[], int type, char * filename, int filenum)
{ {
switch(type) switch(type)
{ {
if(GCSettings.SaveMethod == DEVICE_AUTO)
GCSettings.SaveMethod = autoSaveMethod(SILENT);
if(GCSettings.SaveMethod == DEVICE_AUTO)
return false;
case FILE_SRAM: case FILE_SRAM:
case FILE_SNAPSHOT: case FILE_SNAPSHOT:
sprintf(folder, GCSettings.SaveFolder); sprintf(folder, GCSettings.SaveFolder);
@ -650,7 +656,7 @@ OpenGameList ()
// change current dir to roms directory // change current dir to roms directory
if(device > 0) if(device > 0)
sprintf(browser.dir, "%s%s", pathPrefix[device], GCSettings.LoadFolder); sprintf(browser.dir, "%s%s/", pathPrefix[device], GCSettings.LoadFolder);
else else
browser.dir[0] = 0; browser.dir[0] = 0;

View File

@ -378,11 +378,9 @@ bool ChangeInterface(int device, bool silent)
case DEVICE_DVD: case DEVICE_DVD:
mounted = MountDVD(silent); mounted = MountDVD(silent);
break; break;
#ifdef HW_RVL
case DEVICE_SMB: case DEVICE_SMB:
mounted = ConnectShare(silent); mounted = ConnectShare(silent);
break; break;
#endif
case DEVICE_MC_SLOTA: case DEVICE_MC_SLOTA:
mounted = TestMC(CARD_SLOTA, silent); mounted = TestMC(CARD_SLOTA, silent);
break; break;
@ -525,6 +523,10 @@ ParseDirectory(bool waitParse)
while(!IsDeviceRoot(browser.dir)) while(!IsDeviceRoot(browser.dir))
{ {
char * devEnd = strrchr(browser.dir, '/'); char * devEnd = strrchr(browser.dir, '/');
if(devEnd == NULL)
break;
devEnd[0] = 0; // strip remaining file listing devEnd[0] = 0; // strip remaining file listing
dirIter = diropen(browser.dir); dirIter = diropen(browser.dir);
if (dirIter) if (dirIter)

View File

@ -356,7 +356,7 @@ void GuiFileBrowser::Update(GuiTrigger * t)
{ {
delete fileListIcon[i]; delete fileListIcon[i];
fileListIcon[i] = NULL; fileListIcon[i] = NULL;
fileListText[i]->SetPosition(10,0); fileListText[i]->SetPosition(5,0);
} }
switch(browserList[browser.pageIndex+i].icon) switch(browserList[browser.pageIndex+i].icon)

View File

@ -8,7 +8,15 @@
* Network and SMB support routines * Network and SMB support routines
****************************************************************************/ ****************************************************************************/
#ifdef HW_RVL #ifdef HW_DOL
bool
ConnectShare (bool silent)
{
return false;
}
#else
#include <network.h> #include <network.h>
#include <smb.h> #include <smb.h>

View File

@ -867,9 +867,9 @@ void LoadPatch()
char patchpath[3][512]; char patchpath[3][512];
memset(patchpath, 0, sizeof(patchpath)); memset(patchpath, 0, sizeof(patchpath));
sprintf(patchpath[0], "%s/%s.ips",browser.dir,ROMFilename); sprintf(patchpath[0], "%s%s.ips",browser.dir,ROMFilename);
sprintf(patchpath[1], "%s/%s.ups",browser.dir,ROMFilename); sprintf(patchpath[1], "%s%s.ups",browser.dir,ROMFilename);
sprintf(patchpath[2], "%s/%s.ppf",browser.dir,ROMFilename); sprintf(patchpath[2], "%s%s.ppf",browser.dir,ROMFilename);
for(patchtype=0; patchtype<3; patchtype++) for(patchtype=0; patchtype<3; patchtype++)
{ {