1 files changed, 13 insertions, 1 deletions
diff --git a/src/frm_main.pas b/src/frm_main.pas
index e56d069f..b5120378 100644
--- a/src/frm_main.pas
+++ b/src/frm_main.pas
@@ -127,6 +127,7 @@ type
     // Used in loading contents
     procedure   AddChildNodes(AHelpFile: THelpFile; AParentNode: TfpgTreeNode; ALevel: longint; var ATopicIndex: longint );
     procedure   ClearNotes;
+    procedure   ClearIndexComponents;
     procedure   SaveNotes(AHelpFile: THelpFile);
     procedure   DisplayTopic(ATopic: TTopic = nil);
     procedure   ResetProgress;
@@ -273,6 +274,7 @@ end;
 
 procedure TMainForm.MainFormDestroy(Sender: TObject);
 begin
+  ClearAllWordSequences;
   DisplayedIndex.Free;
   // save splitter position
   gINI.WriteInteger('Options', 'SplitterLeft', PageControl1.Width);
@@ -1095,7 +1097,8 @@ begin
     SaveNotes( lHelpFile );
   end;
 
-  DisplayedIndex.Clear;
+  ClearIndexComponents;
+  ClearAllWordSequences;
 
   // Now destroy help files
   for FileIndex := 0 to Files.Count - 1 do
@@ -1425,6 +1428,15 @@ begin
   { TODO -oGraeme : Implement me }
 end;
 
+procedure TMainForm.ClearIndexComponents;
+begin
+  IndexSearchEdit.Clear;
+  lbIndex.FocusItem := -1;
+  lbIndex.Items.Clear;
+  DisplayedIndex.Clear;
+  IndexLoaded := False;
+end;
+
 procedure TMainForm.SaveNotes(AHelpFile: THelpFile);
 begin
   { TODO -oGraeme : Implement me }