Changeset 278

Timestamp:

Feb 14, 2019, 10:25:13 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Incorrect way to assign units between two game systems causing crash of the application on exit.

Location:

trunk

Files:

• Forms/UFormGameSystem.pas (modified) (1 diff)
• Forms/UFormGameSystems.lfm (modified) (1 diff)
• Forms/UFormGameSystems.pas (modified) (2 diffs)
• UUnit.pas (modified) (2 diffs)
• xtactics.lpi (modified) (1 diff)

trunk/Forms/UFormGameSystem.pas

@@ -98 +98 @@
 procedure TFormGameSystem.FormDestroy(Sender: TObject);
 begin
-  FormUnitKinds.Free;
+  GameSystem := nil;
+  FreeAndNil(FormUnitKinds);
 end;
 

trunk/Forms/UFormGameSystems.lfm

@@ -10 +10 @@
   OnClose = FormClose
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   OnShow = FormShow
   LCLVersion = '1.8.4.0'

trunk/Forms/UFormGameSystems.pas

@@ -38 +38 @@
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
@@ -159 +160 @@
 end;
 
+procedure TFormGameSystems.FormDestroy(Sender: TObject);
+begin
+  GameSystems := nil;
+end;
+
 procedure TFormGameSystems.FormShow(Sender: TObject);
 begin

trunk/UUnit.pas

@@ -36 +36 @@
     procedure SaveToNode(Node: TDOMNode);
     constructor Create(FreeObjects: Boolean = True);
+    procedure Assign(Source: TUnitKinds);
   end;
 
@@ -353 +354 @@
 end;
 
+procedure TUnitKinds.Assign(Source: TUnitKinds);
+var
+  I: Integer;
+begin
+  while Count > Source.Count do Delete(Count - 1);
+  while Count < Source.Count do AddNew('');
+  for I := 0 to Count - 1 do
+    Items[I].Assign(Source.Items[I]);
+end;
+
 end.
 

trunk/xtactics.lpi

@@ -317 +317 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormUnitKind"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit38>