h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-18 03:27:20 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-song-select-first-track-looping

Browse Source
This commit is contained in:
Dean Herbert 2020-11-03 16:48:20 +09:00
commit f701a38e20
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Online/Spectator/SpectatorStreamingClient.cs
View File

@ -13,6 +13,7 @@ using Newtonsoft.Json;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Logging;
using osu.Game.Beatmaps;
using osu.Game.Online.API;
using osu.Game.Replays.Legacy;
@ -122,19 +123,26 @@ namespace osu.Game.Online.Spectator
isConnected = false;
playingUsers.Clear();
if (ex != null) await tryUntilConnected();
if (ex != null)
{
Logger.Log($"Spectator client lost connection: {ex}", LoggingTarget.Network);
await tryUntilConnected();
}
};
await tryUntilConnected();
async Task tryUntilConnected()
{
Logger.Log("Spectator client connecting...", LoggingTarget.Network);
while (api.State.Value == APIState.Online)
{
try
{
// reconnect on any failure
await connection.StartAsync();
Logger.Log("Spectator client connected!", LoggingTarget.Network);
// success
isConnected = true;
@ -151,8 +159,9 @@ namespace osu.Game.Online.Spectator
break;
}
catch
catch (Exception e)
{
Logger.Log($"Spectator client connection error: {e}", LoggingTarget.Network);
await Task.Delay(5000);
}
}

4
osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
View File

@ -419,11 +419,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
};
// bring in updates from selection changes
EditorBeatmap.HitObjectUpdated += _ => UpdateTernaryStates();
EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) =>
{
Scheduler.AddOnce(updateVisibility);
UpdateTernaryStates();
Scheduler.AddOnce(UpdateTernaryStates);
};
}