Changeset 113 for trunk

Timestamp:

Nov 1, 2016, 12:58:12 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Loading of import source refs for acronyms from file was not working due wrong execution sequence.

Location:

trunk

Files:

• Forms/UFormAbout.lfm (modified) (1 diff)
• UAcronym.pas (modified) (2 diffs)

trunk/Forms/UFormAbout.lfm

@@ -74 +74 @@
     EmailContact = 'robie@centrum.cz'
     AppName = 'Acronym Decoder'
-    ReleaseDate = 42597
+    ReleaseDate = 42675
     RegistryKey = '\Software\'
     RegistryRoot = rrKeyCurrentUser
-    License = 'GNU/GPL'
+    License = 'GNU/GPL v3'
     left = 200
     top = 253

trunk/UAcronym.pas

@@ -1440 +1440 @@
         Categories.LoadFromNode(NewNode);
 
-      // Load acronyms after categories because of references
+      NewNode := FindNode('ImportFormats');
+      if Assigned(NewNode) then
+        ImportFormats.LoadFromNode(NewNode);
+
+      NewNode := FindNode('ImportSources');
+      if Assigned(NewNode) then
+        ImportSources.LoadFromNode(NewNode);
+
+      // Load acronyms after categories and import formats and sources because of references
       NewNode := FindNode('Acronyms');
       if Assigned(NewNode) then
         Acronyms.LoadFromNode(NewNode);
-
-      NewNode := FindNode('ImportFormats');
-      if Assigned(NewNode) then
-        ImportFormats.LoadFromNode(NewNode);
-
-      NewNode := FindNode('ImportSources');
-      if Assigned(NewNode) then
-        ImportSources.LoadFromNode(NewNode);
     end;
   finally
@@ -1478 +1478 @@
       Categories.SaveToNode(NewNode);
 
-      // Save acronyms after categories because of references
+      NewNode := OwnerDocument.CreateElement('ImportFormats');
+      AppendChild(NewNode);
+      ImportFormats.SaveToNode(NewNode);
+
+      NewNode := OwnerDocument.CreateElement('ImportSources');
+      AppendChild(NewNode);
+      ImportSources.SaveToNode(NewNode);
+
+      // Save acronyms after categories, import formats and sources because of references
       NewNode := OwnerDocument.CreateElement('Acronyms');
       AppendChild(NewNode);
       Acronyms.SaveToNode(NewNode);
-
-      NewNode := OwnerDocument.CreateElement('ImportFormats');
-      AppendChild(NewNode);
-      ImportFormats.SaveToNode(NewNode);
-
-      NewNode := OwnerDocument.CreateElement('ImportSources');
-      AppendChild(NewNode);
-      ImportSources.SaveToNode(NewNode);
     end;
     ForceDirectories(ExtractFileDir(FileName));