mirror of https://github.com/ppy/osu
Post merge fixes
This commit is contained in:
parent
f3a84de7b5
commit
8efc504817
|
@ -50,7 +50,7 @@ private void load(TModelManager manager)
|
|||
|
||||
manager.DownloadBegan += download =>
|
||||
{
|
||||
if (download.Info.Equals(ModelInfo.Value))
|
||||
if (download.Model.Equals(ModelInfo.Value))
|
||||
attachDownload(download);
|
||||
};
|
||||
|
||||
|
@ -77,9 +77,9 @@ protected override void Dispose(bool isDisposing)
|
|||
|
||||
#endregion
|
||||
|
||||
private ArchiveDownloadModelRequest<TModel> attachedRequest;
|
||||
private ArchiveDownloadRequest<TModel> attachedRequest;
|
||||
|
||||
private void attachDownload(ArchiveDownloadModelRequest<TModel> request)
|
||||
private void attachDownload(ArchiveDownloadRequest<TModel> request)
|
||||
{
|
||||
if (attachedRequest != null)
|
||||
{
|
||||
|
@ -119,7 +119,7 @@ private void attachDownload(ArchiveDownloadModelRequest<TModel> request)
|
|||
|
||||
private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
|
||||
|
||||
private void itemAdded(TModel s, bool existing) => setDownloadStateFromManager(s, DownloadState.LocallyAvailable);
|
||||
private void itemAdded(TModel s) => setDownloadStateFromManager(s, DownloadState.LocallyAvailable);
|
||||
|
||||
private void itemRemoved(TModel s) => setDownloadStateFromManager(s, DownloadState.NotDownloaded);
|
||||
|
||||
|
|
Loading…
Reference in New Issue