Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 9 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.FileSystem/FileExplorerControl.cs b/Software/Visual_Studio/Tango.FileSystem/FileExplorerControl.cs
index 0a7fe8ddc..58d0772f5 100644
--- a/Software/Visual_Studio/Tango.FileSystem/FileExplorerControl.cs
+++ b/Software/Visual_Studio/Tango.FileSystem/FileExplorerControl.cs
@@ -305,6 +305,14 @@ namespace Tango.FileSystem
         public static readonly DependencyProperty SelectionModeProperty =
             DependencyProperty.Register("SelectionMode", typeof(SelectionMode), typeof(FileExplorerControl), new PropertyMetadata(SelectionMode.Extended));
 
+        public bool AllowFolderDownload
+        {
+            get { return (bool)GetValue(AllowFolderDownloadProperty); }
+            set { SetValue(AllowFolderDownloadProperty, value); }
+        }
+        public static readonly DependencyProperty AllowFolderDownloadProperty =
+            DependencyProperty.Register("AllowFolderDownload", typeof(bool), typeof(FileExplorerControl), new PropertyMetadata(true));
+
         static FileExplorerControl()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(FileExplorerControl), new FrameworkPropertyMetadata(typeof(FileExplorerControl)));
@@ -369,7 +377,7 @@ namespace Tango.FileSystem
 
                 DownloadCommand?.Execute(SelectedItems.ToList());
 
-            }, () => SelectedItems != null && SelectedItems.Count > 0 && SelectedItems.All(x => x.Type != FileSystemItemType.Drive));
+            }, () => SelectedItems != null && SelectedItems.Count > 0 && SelectedItems.All(x => x.Type != FileSystemItemType.Drive && (AllowFolderDownload || x.Type == FileSystemItemType.File)));
 
             OpenCommand = new RelayCommand(() =>
             {