Changeset 95 for trunk/Forms/UFormImportSources.pas

Timestamp:

Aug 17, 2016, 11:20:37 AM (8 years ago)

Author:

chronos

Message:

• Modified: Do not initialize all forms at startup to save some memory.

File:

• trunk/Forms/UFormImportSources.pas (modified) (2 diffs)

trunk/Forms/UFormImportSources.pas

@@ -187 +187 @@
   NewImportSource := TImportSource.Create;
   NewImportSource.Sources := ImportSources;
-  FormImportSource.Load(NewImportSource);
-  if FormImportSource.ShowModal = mrOk then begin
-    FormImportSource.Save(NewImportSource);
-    if not Assigned(ImportSources.SearchByName(NewImportSource.Name)) then begin;
-      ImportSources.Add(NewImportSource);
-      NewImportSource := nil;
-      Core.AcronymDb.Modified := True;
-      UpdateList;
-    end else ShowMessage(Format(SImportSourceAlreadyExists, [NewImportSource.Name]));
-  end;
-  if Assigned(NewImportSource) then NewImportSource.Free;
+  FormImportSource := TFormImportSource.Create(Self);
+  try
+    FormImportSource.Load(NewImportSource);
+    if FormImportSource.ShowModal = mrOk then begin
+      FormImportSource.Save(NewImportSource);
+      if not Assigned(ImportSources.SearchByName(NewImportSource.Name)) then begin;
+        ImportSources.Add(NewImportSource);
+        NewImportSource := nil;
+        Core.AcronymDb.Modified := True;
+        UpdateList;
+      end else ShowMessage(Format(SImportSourceAlreadyExists, [NewImportSource.Name]));
+    end;
+    if Assigned(NewImportSource) then NewImportSource.Free;
+  finally
+    FreeAndNil(FormImportSource);
+  end;
 end;
 
@@ -227 +232 @@
     NewImportSource := TImportSource.Create;
     NewImportSource.Assign(ListView1.Selected.Data);
-    FormImportSource.Load(NewImportSource);
-    if FormImportSource.ShowModal = mrOk then begin
-      FormImportSource.Save(NewImportSource);
-      if (NewImportSource.Name <> TImportSource(ListView1.Selected.Data).Name) then begin
-        if not Assigned(ImportSources.SearchByName(NewImportSource.Name)) then begin;
+    FormImportSource := TFormImportSource.Create(Self);
+    try
+      FormImportSource.Load(NewImportSource);
+      if FormImportSource.ShowModal = mrOk then begin
+        FormImportSource.Save(NewImportSource);
+        if (NewImportSource.Name <> TImportSource(ListView1.Selected.Data).Name) then begin
+          if not Assigned(ImportSources.SearchByName(NewImportSource.Name)) then begin;
+            TImportSource(ListView1.Selected.Data).Assign(NewImportSource);
+            Core.AcronymDb.Modified := True;
+            UpdateList;
+          end else ShowMessage(Format(SImportSourceAlreadyExists, [NewImportSource.Name]));
+        end else begin
           TImportSource(ListView1.Selected.Data).Assign(NewImportSource);
           Core.AcronymDb.Modified := True;
           UpdateList;
-        end else ShowMessage(Format(SImportSourceAlreadyExists, [NewImportSource.Name]));
-      end else begin
-        TImportSource(ListView1.Selected.Data).Assign(NewImportSource);
-        Core.AcronymDb.Modified := True;
-        UpdateList;
+        end;
       end;
-    end;
-    if Assigned(NewImportSource) then NewImportSource.Free;
+      if Assigned(NewImportSource) then NewImportSource.Free;
+    finally
+      FreeAndNil(FormImportSource);
+    end;
   end;
 end;