[IDE][FIXED] #679 : class already exist

ELENA-LANG · Aug 30, 2024 · 04a586e · 04a586e
1 parent 4da502c
commit 04a586e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/doc/todo.txt b/doc/todo.txt
@@ -25,9 +25,8 @@ In development:
   --------------------------------------
   * x86-64 : mta - test
   * x86-64 : mta - corex
-  * #679
   --------------------------------------
-  * x86-64 : mta - ntlinker64
+  * #679
 
   === Iteration 32 ===
   --------------------------------------

diff --git a/elenasrc3/ide/idecontroller.cpp b/elenasrc3/ide/idecontroller.cpp
@@ -896,10 +896,17 @@ void ProjectController :: includeFile(ProjectModel& model, path_t filePath)
    PathString relPath(filePath);
    _pathHelper->makePathRelative(relPath, *model.projectPath);
 
-   model.sources.add((*relPath).clone());
-   model.addedSources.add((*relPath).clone());
+   // HOTFIX : make sure the file is not included
+   if (model.sources.retrieveIndex<path_t>(*relPath, [](path_t arg, path_t current)
+      {
+         return current.compare(arg);
+      }) == -1)
+   {
+      model.sources.add((*relPath).clone());
+      model.addedSources.add((*relPath).clone());
 
-   model.notSaved = true;
+      model.notSaved = true;
+   }
 }
 
 void ProjectController :: excludeFile(ProjectModel& model, path_t filePath)

diff --git a/elenasrc3/ide/ideversion.h b/elenasrc3/ide/ideversion.h
@@ -1,2 +1,2 @@
 
-#define IDE_REVISION_NUMBER                           14
+#define IDE_REVISION_NUMBER                           15
diff --git a/elenasrc3/ide/windows/winide.cpp b/elenasrc3/ide/windows/winide.cpp
@@ -626,7 +626,6 @@ void IDEWindow :: updateCompileMenu(bool compileEnable, bool debugEnable, bool s
 {
    enableMenuItemById(IDM_PROJECT_COMPILE, compileEnable, false);
    enableMenuItemById(IDM_PROJECT_OPTION, compileEnable, false);
-   enableMenuItemById(IDM_PROJECT_INCLUDE, compileEnable, false);
 
    enableMenuItemById(IDM_DEBUG_RUN, debugEnable, true);
    enableMenuItemById(IDM_DEBUG_STEPINTO, debugEnable, true);
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@

		#define IDE_REVISION_NUMBER 14
		#define IDE_REVISION_NUMBER 15