RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crashes when importing/deleting from model managers

This commit is contained in:
smoogipoo 2018-11-20 18:09:23 +09:00 committed by miterosan
parent aac7081580
commit cd2737156f
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
View File

@ -78,17 +78,17 @@ public void Download()
}
}
private void setAdded(BeatmapSetInfo s)
private void setAdded(BeatmapSetInfo s) => Schedule(() =>
{
if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
DownloadState.Value = DownloadStatus.Downloaded;
}
});
private void setRemoved(BeatmapSetInfo s)
private void setRemoved(BeatmapSetInfo s) => Schedule(() =>
{
if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
DownloadState.Value = DownloadStatus.NotDownloaded;
}
});
private void downloadBegan(DownloadBeatmapSetRequest d)
{

4
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -174,11 +174,11 @@ private void attachDownload(DownloadBeatmapSetRequest request)
};
}
private void setAdded(BeatmapSetInfo s)
private void setAdded(BeatmapSetInfo s) => Schedule(() =>
{
if (s.OnlineBeatmapSetID == SetInfo.OnlineBeatmapSetID)
progressBar.FadeOut(500);
}
});
protected override void LoadComplete()
{

8
osu.Game/Overlays/Music/PlaylistList.cs
View File

@ -83,20 +83,20 @@ private void load(BeatmapManager beatmaps, IBindableBeatmap beatmap)
beatmapBacking.ValueChanged += _ => updateSelectedSet();
}
private void addBeatmapSet(BeatmapSetInfo obj)
private void addBeatmapSet(BeatmapSetInfo obj) => Schedule(() =>
{
var newItem = new PlaylistItem(obj) { OnSelect = set => Selected?.Invoke(set) };
items.Add(newItem);
items.SetLayoutPosition(newItem, items.Count - 1);
}
});
private void removeBeatmapSet(BeatmapSetInfo obj)
private void removeBeatmapSet(BeatmapSetInfo obj) => Schedule(() =>
{
var itemToRemove = items.FirstOrDefault(i => i.BeatmapSetInfo.ID == obj.ID);
if (itemToRemove != null)
items.Remove(itemToRemove);
}
});
private void updateSelectedSet()
{

4
osu.Game/Overlays/MusicController.cs
View File

@ -214,8 +214,8 @@ private void playlistOrderChanged(BeatmapSetInfo beatmapSetInfo, int index)
beatmapSets.Insert(index, beatmapSetInfo);
}
private void handleBeatmapAdded(BeatmapSetInfo obj) => beatmapSets.Add(obj);
private void handleBeatmapRemoved(BeatmapSetInfo obj) => beatmapSets.RemoveAll(s => s.ID == obj.ID);
private void handleBeatmapAdded(BeatmapSetInfo obj) => Schedule(() => beatmapSets.Add(obj));
private void handleBeatmapRemoved(BeatmapSetInfo obj) => Schedule(() => beatmapSets.RemoveAll(s => s.ID == obj.ID));
protected override void LoadComplete()
{

4
osu.Game/Overlays/Settings/Sections/SkinSection.cs
View File

@ -70,8 +70,8 @@ private void load(OsuConfigManager config, SkinManager skins)
dropdownBindable.BindValueChanged(v => configBindable.Value = v.ID);
}
private void itemRemoved(SkinInfo s) => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != s.ID).ToArray();
private void itemAdded(SkinInfo s) => skinDropdown.Items = skinDropdown.Items.Append(s).ToArray();
private void itemRemoved(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != s.ID).ToArray());
private void itemAdded(SkinInfo s) => Schedule(() => skinDropdown.Items = skinDropdown.Items.Append(s).ToArray());
protected override void Dispose(bool isDisposing)
{