From 4047154eecac87d554df9a8d67c6b2ad5ae894dc Mon Sep 17 00:00:00 2001 From: tznind Date: Mon, 23 Nov 2020 11:35:24 +0000 Subject: [PATCH] Fixed returning subdirectory duplicates in example --- Terminal.Gui/Views/TreeView.cs | 2 +- UICatalog/Scenarios/TreeViewFileSystem.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Terminal.Gui/Views/TreeView.cs b/Terminal.Gui/Views/TreeView.cs index c4a2bd15c..58467fc57 100644 --- a/Terminal.Gui/Views/TreeView.cs +++ b/Terminal.Gui/Views/TreeView.cs @@ -375,7 +375,7 @@ namespace Terminal.Gui { public virtual void FetchChildren() { if (tree.ChildrenGetter == null) - return; + return; this.ChildBranches = tree.ChildrenGetter(this.Model).ToDictionary(k=>k,val=>new Branch(tree,this,val)); } diff --git a/UICatalog/Scenarios/TreeViewFileSystem.cs b/UICatalog/Scenarios/TreeViewFileSystem.cs index 0f2cbbb41..cc1c260ed 100644 --- a/UICatalog/Scenarios/TreeViewFileSystem.cs +++ b/UICatalog/Scenarios/TreeViewFileSystem.cs @@ -85,7 +85,7 @@ namespace UICatalog.Scenarios { // If it is a directory it's children are all contained files and dirs if(model is DirectoryInfo d) { try { - return d.GetDirectories().Cast().Union(d.GetFileSystemInfos()); + return d.GetFileSystemInfos(); } catch(SystemException ex) { return new []{ex};