extras/StringsBox; ide/Environment Variables: Fixed memory issues/leaks

diff --git a/extras/gui/controls/StringsBox.ec b/extras/gui/controls/StringsBox.ec
index 0d7fb04..657935c 100644 (file)
--- a/extras/gui/controls/StringsBox.ec
+++ b/extras/gui/controls/StringsBox.ec
@@ -417,8 +417,8 @@ class NamedStringsBox : CommonControl
          return true;
       }
    };
-   DataField nameField { dataType = class(char *), editable = true, freeData = false, width = 120 };
-   DataField stringField { dataType = class(char *), editable = true, freeData = false };
+   DataField nameField { dataType = class(char *), editable = true, width = 120 };
+   DataField stringField { dataType = class(char *), editable = true };
    
    NamedStringsBox()
    {

diff --git a/ide/src/dialogs/WorkspaceSettings.ec b/ide/src/dialogs/WorkspaceSettings.ec
index 792eb2d..df5e89b 100644 (file)
--- a/ide/src/dialogs/WorkspaceSettings.ec
+++ b/ide/src/dialogs/WorkspaceSettings.ec
@@ -73,7 +73,11 @@ class WorkspaceTab : Tab
       if(commandLineArgs.modifiedDocument)
          ide.workspace.commandLineArgs = commandLineArgs.line.text;
       if(environmentVars.modifiedDocument)
+      {
+         ide.workspace.environmentVars.Free();
+         delete ide.workspace.environmentVars;
          ide.workspace.environmentVars = environmentVars.namedStrings;
+      }
       if(sourceDirs.modifiedDocument)
          ide.workspace.UpdateSourceDirsArray(sourceDirs.strings);
 

diff --git a/ide/src/project/Workspace.ec b/ide/src/project/Workspace.ec
index 85f15de..a5ec699 100644 (file)
--- a/ide/src/project/Workspace.ec
+++ b/ide/src/project/Workspace.ec
@@ -990,6 +990,7 @@ Workspace LoadWorkspace(char * filePath, char * fromProjectFile)
 
                      if(!strcmpi(buffer, "Environment Variables"))
                      {
+                        workspace.environmentVars.Free();
                         delete workspace.environmentVars;
                         workspace.environmentVars = { };
                      }