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

Revert "Fix two small RageFile bugs"

Browse Source 
This reverts commit 5d2667add1.
This commit is contained in:
sukibaby
2025-05-03 07:54:02 -07:00
committed by teejusb
parent a517a3887c
commit 79f2e2e5ee
2 changed files with 9 additions and 6 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; } const g_RegisterDriver2;
RageFileDriverDirect::RageFileDriverDirect( const RString &sRoot ): RageFileDriverDirect::RageFileDriverDirect( const RString &sRoot ):
RageFileDriver( new DirectFilenameDB(sRoot) ), m_sRoot(sRoot) RageFileDriver( new DirectFilenameDB(sRoot) )
{ {
Remount( sRoot ); Remount( sRoot );
} }
@@ -158,7 +158,7 @@ bool RageFileDriverDirect::Move( const RString &sOldPath_, const RString &sNewPa
bool RageFileDriverDirect::Remove( const RString &sPath_ ) bool RageFileDriverDirect::Remove( const RString &sPath_ )
{ {
if( m_sRoot.empty() || m_sRoot == "(empty)") if( m_sRoot == "(empty)" )
{ {
return false; return false;
} }
src/RageFileManager.cpp
+7 -4
View File
@@ -716,13 +716,16 @@ bool RageFileManager::Mount( const RString &sType, const RString &sRoot_, const
RageFileDriver *pDriver = MakeFileDriver( sType, sRoot ); RageFileDriver *pDriver = MakeFileDriver( sType, sRoot );
if( pDriver == nullptr ) if( pDriver == nullptr )
{ {
const RString errorMsg = ssprintf("Can't mount unknown VFS type \"%s\", root \"%s\"", sType.c_str(), sRoot.c_str()); CHECKPOINT_M( 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() ); 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() );
return false; return false;
} }
CHECKPOINT_M("Driver successfully made."); CHECKPOINT_M("Driver %s successfully made.");
LoadedDriver *pLoadedDriver = new LoadedDriver; LoadedDriver *pLoadedDriver = new LoadedDriver;
pLoadedDriver->m_pDriver = pDriver; pLoadedDriver->m_pDriver = pDriver;