Changeset 12 for trunk/LocalPlayer/Help.pas

Timestamp:

Jan 7, 2017, 8:25:59 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Various memory leaks.
• Fixed: Exceptions during browsing in help.

File:

• trunk/LocalPlayer/Help.pas (modified) (4 diffs)

trunk/LocalPlayer/Help.pas

@@ -37 +37 @@
 
 type
+
+  { THyperText }
+
   THyperText = class(TStringList)
     procedure AddLine(s: String = ''; Format: integer = 0; Picpix: integer = 0;
       LinkCategory: integer = 0; LinkIndex: integer = 0);
+    procedure AddText(Const S : String); override;
     procedure LF;
+    destructor Destroy; override;
   end;
 
@@ -122 +127 @@
 end;
 
+procedure THyperText.AddText(const S: String);
+begin
+  AddLine(S);
+end;
+
 procedure THyperText.LF;
 begin
   AddLine;
+end;
+
+destructor THyperText.Destroy;
+begin
+  inherited Destroy;
 end;
 
@@ -189 +204 @@
   inc(ModalFrameIndent, 29);
   MainText := THyperText.Create;
+  MainText.OwnsObjects := True;
   SearchResult := THyperText.Create;
+  SearchResult.OwnsObjects := True;
   CreatePVSB(sb, Handle, 36, 551, 36 + 432);
 
@@ -226 +243 @@
 procedure THelpDlg.FormDestroy(Sender: TObject);
 begin
-  MainText.Free;
-  SearchResult.Free;
-  ExtPic.Free;
-  TerrIcon.Free;
-  HelpText.Free;
-  // CaptionFont.Free;
+  FreeAndNil(MainText);
+  FreeAndNil(SearchResult);
+  FreeAndNil(ExtPic);
+  FreeAndNil(TerrIcon);
+  FreeAndNil(HelpText);
+  // FreeAndNil(CaptionFont);
 end;