@@ -987,32 +987,29 @@ await Task.Run(async () =>
987987                            if  ( ( ( FileAttributes ) findData . dwFileAttributes  &  FileAttributes . System )  !=  FileAttributes . System ) 
988988                            { 
989989                                var  itemPath  =  Path . Combine ( path ,  findData . cFileName ) ; 
990-                                 if  ( ( ( FileAttributes ) findData . dwFileAttributes  &  FileAttributes . Hidden )  ==  FileAttributes . Hidden  &&   ! AppSettings . AreHiddenItemsVisible ) 
990+                                 if  ( ( ( FileAttributes ) findData . dwFileAttributes  &  FileAttributes . Hidden )  !=  FileAttributes . Hidden  ||   AppSettings . AreHiddenItemsVisible ) 
991991                                { 
992-                                     hasNextFile  =  FindNextFile ( hFile ,  out  findData ) ; 
993-                                     continue ; 
994-                                 } 
995- 
996-                                 if  ( ( ( FileAttributes ) findData . dwFileAttributes  &  FileAttributes . Directory )  !=  FileAttributes . Directory ) 
997-                                 { 
998-                                     var  listedItem  =  await  AddFile ( findData ,  path ,  returnformat ) ; 
999-                                     if  ( listedItem  !=  null ) 
992+                                     if  ( ( ( FileAttributes ) findData . dwFileAttributes  &  FileAttributes . Directory )  !=  FileAttributes . Directory ) 
1000993                                    { 
1001-                                         tempList . Add ( listedItem ) ; 
1002-                                         ++ count ; 
1003-                                     } 
1004-                                 } 
1005-                                 else  if  ( ( ( FileAttributes ) findData . dwFileAttributes  &  FileAttributes . Directory )  ==  FileAttributes . Directory ) 
1006-                                 { 
1007-                                     if  ( findData . cFileName  !=  "."  &&  findData . cFileName  !=  ".." ) 
1008-                                     { 
1009-                                         var  listedItem  =  AddFolder ( findData ,  path ,  returnformat ) ; 
994+                                         var  listedItem  =  await  AddFile ( findData ,  path ,  returnformat ) ; 
1010995                                        if  ( listedItem  !=  null ) 
1011996                                        { 
1012997                                            tempList . Add ( listedItem ) ; 
1013998                                            ++ count ; 
1014999                                        } 
10151000                                    } 
1001+                                     else  if  ( ( ( FileAttributes ) findData . dwFileAttributes  &  FileAttributes . Directory )  ==  FileAttributes . Directory ) 
1002+                                     { 
1003+                                         if  ( findData . cFileName  !=  "."  &&  findData . cFileName  !=  ".." ) 
1004+                                         { 
1005+                                             var  listedItem  =  AddFolder ( findData ,  path ,  returnformat ) ; 
1006+                                             if  ( listedItem  !=  null ) 
1007+                                             { 
1008+                                                 tempList . Add ( listedItem ) ; 
1009+                                                 ++ count ; 
1010+                                             } 
1011+                                         } 
1012+                                     } 
10161013                                } 
10171014                            } 
10181015                            if  ( _addFilesCTS . IsCancellationRequested ) 
@@ -1866,4 +1863,4 @@ public class WorkingDirectoryModifiedEventArgs : EventArgs
18661863    { 
18671864        public  string  Path  {  get ;  set ;  } 
18681865    } 
1869- } 
1866+ } 
0 commit comments