RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-04-19 05:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore possible nulls from stream reader in IPC

Browse Source 
Any failures will be caught. They're not logged, but they also weren't
before. Error handling can be improved at a future date, this series of
changes is primarily intending to unblock a new inspection.
This commit is contained in:
Bartłomiej Dach 2021-05-14 23:53:37 +02:00
parent d581e0a252
commit ae71389ebe
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tournament/IPC/FileBasedIPC.cs
View File

@ -7,6 +7,7 @@ using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.Win32; using Microsoft.Win32;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Threading; using osu.Framework.Threading;
@ -77,8 +78,8 @@ namespace osu.Game.Tournament.IPC
using (var stream = IPCStorage.GetStream(file_ipc_filename)) using (var stream = IPCStorage.GetStream(file_ipc_filename))
using (var sr = new StreamReader(stream)) using (var sr = new StreamReader(stream))
{ {
var beatmapId = int.Parse(sr.ReadLine()); var beatmapId = int.Parse(sr.ReadLine().AsNonNull());
var mods = int.Parse(sr.ReadLine()); var mods = int.Parse(sr.ReadLine().AsNonNull());
if (lastBeatmapId != beatmapId) if (lastBeatmapId != beatmapId)
{ {
@ -124,7 +125,7 @@ namespace osu.Game.Tournament.IPC
using (var stream = IPCStorage.GetStream(file_ipc_state_filename)) using (var stream = IPCStorage.GetStream(file_ipc_state_filename))
using (var sr = new StreamReader(stream)) using (var sr = new StreamReader(stream))
{ {
State.Value = (TourneyState)Enum.Parse(typeof(TourneyState), sr.ReadLine()); State.Value = (TourneyState)Enum.Parse(typeof(TourneyState), sr.ReadLine().AsNonNull());
} }
} }
catch (Exception) catch (Exception)