1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 10:17:19 +08:00

Merge pull request #12390 from peppy/fix-import-multiple-file-types

Fix import multiple file types via drag potentially reaching the wrong importer
This commit is contained in:
Dan Balasescu 2021-04-13 18:21:54 +09:00 committed by GitHub
commit d41e3690fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -433,12 +433,15 @@ namespace osu.Game
if (paths.Length == 0) if (paths.Length == 0)
return; return;
var extension = Path.GetExtension(paths.First())?.ToLowerInvariant(); var filesPerExtension = paths.GroupBy(p => Path.GetExtension(p).ToLowerInvariant());
foreach (var importer in fileImporters) foreach (var groups in filesPerExtension)
{ {
if (importer.HandledExtensions.Contains(extension)) foreach (var importer in fileImporters)
await importer.Import(paths).ConfigureAwait(false); {
if (importer.HandledExtensions.Contains(groups.Key))
await importer.Import(groups.ToArray()).ConfigureAwait(false);
}
} }
} }