h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 01:22:59 +08:00
Code Issues Releases Wiki Activity

catch ObjectDisposedException

Browse Source
This commit is contained in:
cdwcgt 2023-02-19 02:06:07 +09:00
parent d611603742
commit 30985f192e
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Database/LegacyArchiveExporter.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
@ -39,6 +40,8 @@ namespace osu.Game.Database
float i = 0; float i = 0;
bool fileMissing = false; bool fileMissing = false;
try
{
foreach (var file in model.Files) foreach (var file in model.Files)
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
@ -69,5 +72,14 @@ namespace osu.Game.Database
notification.Text = $"Exporting... ({i}/{model.Files.Count()})"; notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
} }
} }
catch (ObjectDisposedException)
{
// outputStream may close before writing when request cancel
if (cancellationToken.IsCancellationRequested)
return;
throw;
}
}
} }
} }