CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 20:20:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

fixed #834: Indexer catch unauthorized access exception

Browse source
This commit is contained in:
Jaex 2015-08-03 10:23:32 +03:00
parent 6d6e338bf1
commit e2746e47e3
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Greenshot.ImageEditor/UnmanagedHelpers/GDIplus.cs
View file

@ -196,7 +196,7 @@ public static bool IsBlurPossible(int radius)
Version version = Environment.OSVersion.Version;
bool isWindows8OrHigher = (version.Major == 6 && version.Minor >= 2) || version.Major > 6;
return !isWindows8OrHigher || radius >= 20; ;
return !isWindows8OrHigher || radius >= 20;
}
/// <summary>

40
ShareX.IndexerLib/Indexer.cs
View file

@ -77,31 +77,37 @@ protected FolderInfo GetFolderInfo(string folderPath, int level = 0)
if (config.MaxDepthLevel == 0 || level < config.MaxDepthLevel)
{
DirectoryInfo currentDirectoryInfo = new DirectoryInfo(folderPath);
foreach (DirectoryInfo directoryInfo in currentDirectoryInfo.GetDirectories())
try
{
if (config.SkipHiddenFolders && directoryInfo.Attributes.HasFlag(FileAttributes.Hidden))
DirectoryInfo currentDirectoryInfo = new DirectoryInfo(folderPath);
foreach (DirectoryInfo directoryInfo in currentDirectoryInfo.GetDirectories())
{
continue;
if (config.SkipHiddenFolders && directoryInfo.Attributes.HasFlag(FileAttributes.Hidden))
{
continue;
}
FolderInfo subFolderInfo = GetFolderInfo(directoryInfo.FullName, level + 1);
folderInfo.Folders.Add(subFolderInfo);
subFolderInfo.Parent = folderInfo;
}
FolderInfo subFolderInfo = GetFolderInfo(directoryInfo.FullName, level + 1);
folderInfo.Folders.Add(subFolderInfo);
subFolderInfo.Parent = folderInfo;
}
foreach (FileInfo fileInfo in currentDirectoryInfo.GetFiles())
{
if (config.SkipHiddenFiles && fileInfo.Attributes.HasFlag(FileAttributes.Hidden))
foreach (FileInfo fileInfo in currentDirectoryInfo.GetFiles())
{
continue;
if (config.SkipHiddenFiles && fileInfo.Attributes.HasFlag(FileAttributes.Hidden))
{
continue;
}
folderInfo.Files.Add(fileInfo);
}
folderInfo.Files.Add(fileInfo);
folderInfo.Files.Sort((x, y) => x.Name.CompareTo(y.Name));
}
catch (UnauthorizedAccessException)
{
}
folderInfo.Files.Sort((x, y) => x.Name.CompareTo(y.Name));
}
return folderInfo;