fix FileSystem

irov · Nov 4, 2024 · e250cb5 · e250cb5
1 parent fc29582
commit e250cb5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/src/Bootstrapper/Bootstrapper.cpp b/src/Bootstrapper/Bootstrapper.cpp
@@ -2160,6 +2160,8 @@ namespace Mengine
                 ->unloadPlugins();
         }
 
+        SERVICE_FINALIZE( FileSystem );
+
         SERVICE_FINALIZE( LoaderService );
         SERVICE_FINALIZE( TimerService );
         SERVICE_FINALIZE( TimelineService );
@@ -2264,6 +2266,8 @@ namespace Mengine
         SERVICE_DESTROY( HttpSystem );
 #endif
 
+        SERVICE_DESTROY( FileSystem );
+
         SERVICE_DESTROY( HttpService );
         SERVICE_DESTROY( SceneService );
         SERVICE_DESTROY( GameService );

diff --git a/src/Plugins/DevelopmentConverterPlugin/VideoConverterFFMPEGToOGV.cpp b/src/Plugins/DevelopmentConverterPlugin/VideoConverterFFMPEGToOGV.cpp
@@ -45,13 +45,13 @@ namespace Mengine
         const FilePath & inputFolderPath = inputFileGroup->getFolderPath();
         const FilePath & outputFolderPath = outputFileGroup->getFolderPath();
 
-        String full_input;
-        full_input.append( inputFolderPath.c_str() );
-        full_input.append( inputFilePath.c_str() );
+        PathString full_input;
+        full_input.append( inputFolderPath );
+        full_input.append( inputFilePath );
 
-        String full_output;
-        full_output.append( outputFolderPath.c_str() );
-        full_output.append( outputFilePath.c_str() );
+        PathString full_output;
+        full_output.append( outputFolderPath );
+        full_output.append( outputFilePath );
 
         String quality = Helper::getParam( m_options.params, STRINGIZE_STRING_LOCAL( "quality" ), "" );
         String resize = Helper::getParam( m_options.params, STRINGIZE_STRING_LOCAL( "resize" ), "None" );

diff --git a/src/Plugins/DevelopmentConverterPlugin/VideoConverterFFMPEGToOGVA.cpp b/src/Plugins/DevelopmentConverterPlugin/VideoConverterFFMPEGToOGVA.cpp
@@ -45,13 +45,13 @@ namespace Mengine
         const FilePath & inputFolderPath = inputFileGroup->getFolderPath();
         const FilePath & outputFolderPath = outputFileGroup->getFolderPath();
 
-        String full_input;
-        full_input.append( inputFolderPath.c_str() );
-        full_input.append( inputFilePath.c_str() );
+        PathString full_input;
+        full_input.append( inputFolderPath );
+        full_input.append( inputFilePath );
 
-        String full_output;
-        full_output.append( outputFolderPath.c_str() );
-        full_output.append( outputFilePath.c_str() );
+        PathString full_output;
+        full_output.append( outputFolderPath );
+        full_output.append( outputFilePath );
 
         String quality = Helper::getParam( m_options.params, STRINGIZE_STRING_LOCAL( "quality" ), "" );
 

diff --git a/src/Plugins/ZipPlugin/FileGroupZip.cpp b/src/Plugins/ZipPlugin/FileGroupZip.cpp
@@ -542,7 +542,7 @@ namespace Mengine
         MENGINE_UNUSED( _lambda );
 
         PathString mask;
-        mask.append( _filePath.c_str(), _filePath.size() );
+        mask.append( _filePath );
         mask.append( _mask );
 
         for( const FilePath & path : m_indexes )

diff --git a/src/Services/AccountService/AccountService.cpp b/src/Services/AccountService/AccountService.cpp
@@ -242,7 +242,7 @@ namespace Mengine
     AccountInterfacePtr AccountService::newAccount_( const ConstString & _accountId, const DocumentInterfacePtr & _doc )
     {
         PathString accountString;
-        accountString.append( _accountId );
+        accountString.append( _accountId.c_str(), _accountId.size() );
         accountString.append( MENGINE_PATH_DELIM );
 
         FilePath accountPath = Helper::stringizeFilePath( accountString );