sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 14:17:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13979 from peppy/fix-incorrect-success-oop

Browse Source 
Fix derived API request types firing success when they shouldn't
This commit is contained in:
Dan Balasescu
2021-07-22 20:07:23 +09:00
committed by GitHub
parent cde8ae6f18 57e5f5575a
commit 175f3ca57d
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Online/API/APIDownloadRequest.cs
View File

@ -16,6 +16,11 @@ namespace osu.Game.Online.API
/// </summary>
protected virtual string FileExtension { get; } = @".tmp";
protected APIDownloadRequest()
{
base.Success += () => Success?.Invoke(filename);
}
protected override WebRequest CreateWebRequest()
{
var file = Path.GetTempFileName();
@ -39,12 +44,6 @@ namespace osu.Game.Online.API
TriggerSuccess();
}
internal override void TriggerSuccess()
{
base.TriggerSuccess();
Success?.Invoke(filename);
}
public event APIProgressHandler Progressed;
public new event APISuccessHandler<string> Success;

13
osu.Game/Online/API/APIRequest.cs
View File

@ -25,6 +25,11 @@ namespace osu.Game.Online.API
/// </summary>
public new event APISuccessHandler<T> Success;
protected APIRequest()
{
base.Success += () => Success?.Invoke(Result);
}
protected override void PostProcess()
{
base.PostProcess();
@ -40,12 +45,6 @@ namespace osu.Game.Online.API
TriggerSuccess();
}
internal override void TriggerSuccess()
{
base.TriggerSuccess();
Success?.Invoke(Result);
}
}
/// <summary>
@ -132,7 +131,7 @@ namespace osu.Game.Online.API
{
}
internal virtual void TriggerSuccess()
internal void TriggerSuccess()
{
lock (completionStateLock)
{