冒険の書の作成の時に古いCookieを削除するようにした。

[gikonavigoeson/gikonavi.git] / FavoriteAdd.pas

diff --git a/FavoriteAdd.pas b/FavoriteAdd.pas
index 9dcf4d2..2bf2192 100644 (file)
--- a/FavoriteAdd.pas
+++ b/FavoriteAdd.pas
@@ -49,7 +49,7 @@ var
        newNode : TTreeNode;
 begin
        while src <> nil do begin
-               if src.HasChildren then begin
+               if TObject( src.Data ) is TFavoriteFolder then begin
                        newNode := FolderTreeView.Items.AddChildObject( dst, src.Text, src.Data );
                        newNode.ImageIndex              := src.ImageIndex;
                        newNode.SelectedIndex   := src.SelectedIndex;
@@ -70,11 +70,10 @@ begin
        FolderTreeView.Items.Clear;
        src             := FavoriteDM.TreeView.Items.GetFirstNode;
        node    := TTreeNode.Create( FolderTreeView.Items );
+       node := FolderTreeView.Items.AddFirst( node, src.Text );
        node.Data                                               := src.Data;
        node.ImageIndex                 := src.ImageIndex;
        node.SelectedIndex      := src.SelectedIndex;
-       node.HasChildren                := True;
-       node := FolderTreeView.Items.AddFirst( node, src.Text );
        CopyTree( node, src.getFirstChild );
 
        if FolderTreeView.Items.GetFirstNode <> nil then begin
@@ -123,11 +122,12 @@ begin
        if FolderTreeView.Selected = nil then
                Exit;
 
-       Node            := FolderTreeView.Items.GetFirstNode.getFirstChild;
+       Node            := FolderTreeView.Items.GetFirstNode;
        while Node <> nil do begin
                FavNode := GetGikoFavoriteNode(Node.Data);
                if FavNode = nil then begin
-                       FavNode := GetGikoFavoriteNode(Node.Parent.Data);
+                       if Node.Parent <> nil then
+                               FavNode := GetGikoFavoriteNode(Node.Parent.Data);
                        if FavNode <> nil then begin
                                NewNode := FavoriteDM.TreeView.Items.AddChildObject(FavNode, Node.Text, Node.Data);
                                NewNode.ImageIndex := 14;