mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-10-18 11:33:23 +03:00
Fix recursive directory removal across platforms
Add FileSystem::dirRemoveAll() to normalize trailing separators and use the non-throwing std::filesystem::remove_all overload. Migrate ecode and unit-test cleanup call sites to the centralized helper, preventing Haiku from crashing when removing directories with trailing slashes during shutdown.
This commit is contained in:
@@ -1046,14 +1046,6 @@ App::App( const size_t& jobs, const std::vector<std::string>& args ) :
|
||||
mFontPickerController( std::make_unique<FontPickerController>( this ) ),
|
||||
mSettingsActions( std::make_unique<SettingsActions>( this ) ) {}
|
||||
|
||||
static void fsRemoveAll( const std::string& fpath ) {
|
||||
#if EE_PLATFORM == EE_PLATFORM_WIN
|
||||
fs::remove_all( std::filesystem::path( String( fpath ).toWideString() ) );
|
||||
#else
|
||||
fs::remove_all( fpath );
|
||||
#endif
|
||||
}
|
||||
|
||||
App::~App() {
|
||||
appInstance = nullptr;
|
||||
mDestroyingApp = true;
|
||||
@@ -1082,7 +1074,8 @@ App::~App() {
|
||||
}
|
||||
mDirTree.reset();
|
||||
|
||||
fsRemoveAll( mPidPath );
|
||||
if ( !FileSystem::dirRemoveAll( mPidPath ) )
|
||||
Log::warning( "Failed to remove directory \"%s\"", mPidPath );
|
||||
|
||||
if ( mFirstInstance )
|
||||
FileSystem::fileRemove( firstInstanceIndicatorPath() );
|
||||
|
||||
Reference in New Issue
Block a user