1 files changed, 5 insertions, 2 deletions
diff --git a/macros/ToolInitialization/INIT_RemoveDirs.sci b/macros/ToolInitialization/INIT_RemoveDirs.sci
index 536b909e..4d72ab78 100644
--- a/macros/ToolInitialization/INIT_RemoveDirs.sci
+++ b/macros/ToolInitialization/INIT_RemoveDirs.sci
@@ -39,7 +39,8 @@ if (SharedInfoRunMode == 'GenLibraryStructure' | SharedInfoRunMode == 'All')
    if (yesno=='y')      
       rmdir(FileInfo.WorkingDir,'s'); // delete WorkingDir if it exists due to previous translations...
       mdelete(FileInfo.OutCCCodeDir+'/*.h'); // delete .h files generated in previous translations (if any).
-      mdelete(FileInfo.OutCCCodeDir+'/*.c'); // delete .h files generated in previous translations (if any).
+      mdelete(FileInfo.OutCCCodeDir+'/*.c'); // delete .c files generated in previous translations (if any).
+      mdelete(FileInfo.OutCCCodeDir+'/*.cpp'); // delete .cpp files generated in previous translations (if any).
       mdelete(FileInfo.OutCCCodeDir+'/Makefile'); // delete .h files generated in previous translations (if any).
       // Note I don't delete includes, interfaces and and src directories to avoid recompiling them every time
       // a new translation is launched. I only delete source files generated by user.
@@ -61,7 +62,9 @@ elseif (SharedInfoRunMode == 'Translate')
       rmdir(FileInfo.OutCCCodeDir,'s');
    else
       SCI2Cerror('Cannot continue, because you don''t want to delete: '+FileInfo.OutCCCodeDir);
-   end
+   end   
+elseif (SharedInfoRunMode == 'FunCall')   
+   //Do nothing
 else
    disp('Unknown RunMode: ""'+SharedInfoRunMode+'"".');
    disp('Please check RunMode parameter in the SCI2CInputParameters.sce file');