mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 11:28:00 +08:00
Fix single file component loading not actually working correctly
This commit is contained in:
parent
df18508bd6
commit
4b54c65d3f
@ -506,22 +506,24 @@ namespace osu.Game
|
||||
// we could avoid the need for scheduling altogether.
|
||||
Schedule(() =>
|
||||
{
|
||||
if (asyncLoadStream != null)
|
||||
var previousLoadStream = asyncLoadStream;
|
||||
|
||||
//chain with existing load stream
|
||||
asyncLoadStream = Task.Run(async () =>
|
||||
{
|
||||
//chain with existing load stream
|
||||
asyncLoadStream = asyncLoadStream.ContinueWith(async t =>
|
||||
if (previousLoadStream != null)
|
||||
await previousLoadStream;
|
||||
|
||||
try
|
||||
{
|
||||
try
|
||||
{
|
||||
await LoadComponentAsync(d, add);
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
}
|
||||
});
|
||||
}
|
||||
else
|
||||
asyncLoadStream = LoadComponentAsync(d, add);
|
||||
Logger.Log($"{d}...", LoggingTarget.Debug);
|
||||
await LoadComponentAsync(d, add);
|
||||
Logger.Log($"{d} ✓", LoggingTarget.Debug);
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user