actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix two small RageFile bugs

Browse Source 
1) RageFileDriverDirect was failing to assign m_sRoot

2) Improve check if m_sRoot is empty

3) Fix a semi-broken logging method in RageFileManager
This commit is contained in:
sukibaby
2024-07-21 06:24:47 -07:00
committed by teejusb
parent e60cf2aa0d
commit 5d2667add1
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageFileDriverDirect.cpp
+2 -2
View File
@@ -40,7 +40,7 @@ static struct FileDriverEntry_DIRRO: public FileDriverEntry
} const g_RegisterDriver2;
RageFileDriverDirect::RageFileDriverDirect( const RString &sRoot ):
RageFileDriver( new DirectFilenameDB(sRoot) )
RageFileDriver( new DirectFilenameDB(sRoot) ), m_sRoot(sRoot)
{
Remount( sRoot );
}
@@ -158,7 +158,7 @@ bool RageFileDriverDirect::Move( const RString &sOldPath_, const RString &sNewPa
bool RageFileDriverDirect::Remove( const RString &sPath_ )
{
if( m_sRoot == "(empty)" )
if( m_sRoot.empty() || m_sRoot == "(empty)")
{
return false;
}
src/RageFileManager.cpp
+4 -7
View File
@@ -716,16 +716,13 @@ bool RageFileManager::Mount( const RString &sType, const RString &sRoot_, const
RageFileDriver *pDriver = MakeFileDriver( sType, sRoot );
if( pDriver == nullptr )
{
CHECKPOINT_M( ssprintf("Can't mount unknown VFS type \"%s\", root \"%s\"", sType.c_str(), sRoot.c_str() ) );
if( LOG )
LOG->Warn("Can't mount unknown VFS type \"%s\", root \"%s\"", sType.c_str(), sRoot.c_str() );
else
fprintf( stderr, "Can't mount unknown VFS type \"%s\", root \"%s\"\n", sType.c_str(), sRoot.c_str() );
const RString errorMsg = ssprintf("Can't mount unknown VFS type \"%s\", root \"%s\"", sType.c_str(), sRoot.c_str());
CHECKPOINT_M( errorMsg );
LOG->Warn( "%s", errorMsg.c_str() );
return false;
}
CHECKPOINT_M("Driver %s successfully made.");
CHECKPOINT_M("Driver successfully made.");
LoadedDriver *pLoadedDriver = new LoadedDriver;
pLoadedDriver->m_pDriver = pDriver;