BUG-2080: Fix for an exception when a filename on the clipboard doesn't have an extension. [skip ci]

This commit is contained in:
Robin 2016-12-24 19:59:09 +01:00
parent 5c9fde65ed
commit a91dc8a798

View file

@ -811,19 +811,14 @@ EndSelection:<<<<<<<4
/// <returns></returns> /// <returns></returns>
public static IEnumerable<string> GetImageFilenames(IDataObject dataObject) { public static IEnumerable<string> GetImageFilenames(IDataObject dataObject) {
string[] dropFileNames = (string[]) dataObject.GetData(DataFormats.FileDrop); string[] dropFileNames = (string[]) dataObject.GetData(DataFormats.FileDrop);
if (dropFileNames != null && dropFileNames.Length > 0) { if (dropFileNames != null && dropFileNames.Length > 0)
foreach (string filename in dropFileNames) { {
if (string.IsNullOrEmpty(filename)) return dropFileNames.Where(filename => !string.IsNullOrEmpty(filename))
{ .Where(Path.HasExtension)
continue; .Select(filename => Path.GetExtension(filename).ToLowerInvariant())
} .Where(ext => ImageHelper.StreamConverters.Keys.Contains(ext));
string ext = Path.GetExtension(filename).ToLower().Substring(1);
if (ImageHelper.StreamConverters.ContainsKey(ext))
{
yield return filename;
}
}
} }
return Enumerable.Empty<string>();
} }
/// <summary> /// <summary>