diff --git a/Osu2Saber/ViewModel/MainWindowViewModel.cs b/Osu2Saber/ViewModel/MainWindowViewModel.cs index 020d2b3..2c3dc14 100644 --- a/Osu2Saber/ViewModel/MainWindowViewModel.cs +++ b/Osu2Saber/ViewModel/MainWindowViewModel.cs @@ -142,28 +142,20 @@ private void ModelChanged(object sender, PropertyChangedEventArgs e) public void DragOver(IDropInfo dropInfo) { - var dragFileList = ((DataObject)dropInfo.Data).GetFileDropList().Cast(); - dropInfo.Effects = dragFileList.Any(item => - { - var extension = Path.GetExtension(item); - return extension != null && extension.Equals(".zip"); - }) ? DragDropEffects.Copy : DragDropEffects.None; + var files = ((DataObject)dropInfo.Data).GetFileDropList().Cast(); + dropInfo.Effects = files.Any(fname => fname.EndsWith(".zip")) + ? DragDropEffects.Copy : DragDropEffects.None; } public void Drop(IDropInfo dropInfo) { - var dragFileList = ((DataObject)dropInfo.Data).GetFileDropList().Cast() + var files = ((DataObject)dropInfo.Data).GetFileDropList().Cast() .Where(fname => fname.EndsWith(".zip") || fname.EndsWith(".osz")) .ToList(); - //dropInfo.Effects = dragFileList.Any(item => - //{ - // var extension = Path.GetExtension(item); - // return extension != null && extension.Equals(".zip"); - //}) ? DragDropEffects.Copy : DragDropEffects.None; - if (dragFileList.Count == 0) return; + if (files.Count == 0) return; - foreach (var file in dragFileList) + foreach (var file in files) { OszFiles.Add(file); }