Skip to content

Commit dad39d3

Browse files
authored
Merge ppy/master (5 commits: duels, spectator preview stop, beatmap panel fix, results panel, pen settings) — fork takes precedence on conflicts
Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
2 parents 5433f32 + a3b8b9a commit dad39d3

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -333,12 +333,15 @@ protected override void LoadComplete()
333333
}
334334
}
335335

336+
client.MatchmakingLobbyStatusChanged += onMatchmakingLobbyStatusChanged;
337+
336338
currentState.BindTo(queue.CurrentState);
337339
currentState.BindValueChanged(s => SetState(s.NewValue));
338340
client.MatchmakingLobbyStatusChanged += onMatchmakingLobbyStatusChanged;
339341

340342
selectedPool.BindTo(queue.SelectedPool);
341343
selectedPool.BindValueChanged(onSelectedPoolChanged, true);
344+
342345
populateAvailablePools().FireAndForget();
343346
}
344347

@@ -450,14 +453,10 @@ public override bool OnExiting(ScreenExitEvent e)
450453
if (base.OnExiting(e))
451454
return true;
452455

453-
client.MatchmakingLeaveLobby().FireAndForget();
454-
455456
switch (currentState.Value)
456457
{
457458
default:
458-
return false;
459-
460-
case MatchmakingScreenState.Queueing:
459+
client.MatchmakingLeaveLobby().FireAndForget();
461460
queue.SearchInBackground();
462461
return false;
463462

osu.Game/Screens/Play/SoloSpectatorScreen.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,5 +275,11 @@ public override bool OnExiting(ScreenExitEvent e)
275275
previewTrackManager.StopAnyPlaying(this);
276276
return base.OnExiting(e);
277277
}
278+
279+
public override void OnSuspending(ScreenTransitionEvent e)
280+
{
281+
previewTrackManager.StopAnyPlaying(this);
282+
base.OnSuspending(e);
283+
}
278284
}
279285
}

0 commit comments

Comments
 (0)