1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-26 03:09:54 +08:00

Merge pull request #9765 from peppy/fix-match-forcing-playback

Fix multiplayer match select forcing playback even when user paused
This commit is contained in:
Dan Balasescu
2020-08-04 12:27:05 +09:00
committed by GitHub
Unverified
+5 -2
View File
@@ -17,6 +17,7 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Input;
using osu.Game.Online.API;
using osu.Game.Online.Multiplayer;
using osu.Game.Overlays;
using osu.Game.Screens.Menu;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Multi.Lounge;
@@ -50,6 +51,9 @@ namespace osu.Game.Screens.Multi
[Cached]
private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
[Resolved]
private MusicController music { get; set; }
[Cached(Type = typeof(IRoomManager))]
private RoomManager roomManager;
@@ -346,8 +350,7 @@ namespace osu.Game.Screens.Multi
track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
track.Looping = true;
if (!track.IsRunning)
track.Restart();
music.EnsurePlayingSomething();
}
}
else