h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:12:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #19536 from frenzibyte/playlists-settings-leak

Browse Source 
Fix playlist settings reference leak due to unsafe binding
This commit is contained in:
Dan Balasescu 2022-08-02 13:30:55 +09:00 committed by GitHub
commit fc0914bf77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSettingsOverlay.cs
View File

@ -1,8 +1,6 @@
// 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.
#nullable disable
using System; using System;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Linq; using System.Linq;
@ -29,9 +27,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
{ {
public class PlaylistsRoomSettingsOverlay : RoomSettingsOverlay public class PlaylistsRoomSettingsOverlay : RoomSettingsOverlay
{ {
public Action EditPlaylist; public Action? EditPlaylist;
private MatchSettings settings; private MatchSettings settings = null!;
protected override OsuButton SubmitButton => settings.ApplyButton; protected override OsuButton SubmitButton => settings.ApplyButton;
@ -55,28 +53,30 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
{ {
private const float disabled_alpha = 0.2f; private const float disabled_alpha = 0.2f;
public Action EditPlaylist; public Action? EditPlaylist;
public OsuTextBox NameField, MaxParticipantsField, MaxAttemptsField; public OsuTextBox NameField = null!, MaxParticipantsField = null!, MaxAttemptsField = null!;
public OsuDropdown<TimeSpan> DurationField; public OsuDropdown<TimeSpan> DurationField = null!;
public RoomAvailabilityPicker AvailabilityPicker; public RoomAvailabilityPicker AvailabilityPicker = null!;
public TriangleButton ApplyButton; public TriangleButton ApplyButton = null!;
public bool IsLoading => loadingLayer.State.Value == Visibility.Visible; public bool IsLoading => loadingLayer.State.Value == Visibility.Visible;
public OsuSpriteText ErrorText; public OsuSpriteText ErrorText = null!;
private LoadingLayer loadingLayer; private LoadingLayer loadingLayer = null!;
private DrawableRoomPlaylist playlist; private DrawableRoomPlaylist playlist = null!;
private OsuSpriteText playlistLength; private OsuSpriteText playlistLength = null!;
private PurpleTriangleButton editPlaylistButton; private PurpleTriangleButton editPlaylistButton = null!;
[Resolved(CanBeNull = true)]
private IRoomManager manager { get; set; }
[Resolved] [Resolved]
private IAPIProvider api { get; set; } private IRoomManager? manager { get; set; }
[Resolved]
private IAPIProvider api { get; set; } = null!;
private IBindable<APIUser> localUser = null!;
private readonly Room room; private readonly Room room;
@ -304,7 +304,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
MaxAttempts.BindValueChanged(count => MaxAttemptsField.Text = count.NewValue?.ToString(), true); MaxAttempts.BindValueChanged(count => MaxAttemptsField.Text = count.NewValue?.ToString(), true);
Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true); Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
api.LocalUser.BindValueChanged(populateDurations, true); localUser = api.LocalUser.GetBoundCopy();
localUser.BindValueChanged(populateDurations, true);
playlist.Items.BindTo(Playlist); playlist.Items.BindTo(Playlist);
Playlist.BindCollectionChanged(onPlaylistChanged, true); Playlist.BindCollectionChanged(onPlaylistChanged, true);