Lease selected room while in match screen to avoid lounge potentially…

… changing it
ppy · Aug 12, 2021 · 4d6101f · 4d6101f
1 parent 054e0e8
commit 4d6101f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -137,7 +137,9 @@ private void removeRooms(IEnumerable<Room> rooms)
 
                 roomFlow.Remove(toRemove);
 
-                selectedRoom.Value = null;
+                // selection may have a lease due to being in a sub screen.
+                if (!selectedRoom.Disabled)
+                    selectedRoom.Value = null;
             }
         }
 

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -49,6 +50,9 @@ public abstract class LoungeSubScreen : OnlinePlaySubScreen
 
         private RoomsContainer roomsContainer;
 
+        [CanBeNull]
+        private LeasedBindable<Room> selectionLease;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -144,6 +148,11 @@ public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
 
+            Debug.Assert(selectionLease != null);
+
+            selectionLease.Return();
+            selectionLease = null;
+
             if (selectedRoom.Value?.RoomID.Value == null)
                 selectedRoom.Value = new Room();
 
@@ -210,7 +219,9 @@ private void onLeaving()
 
         protected virtual void OpenNewRoom(Room room)
         {
-            selectedRoom.Value = room;
+            selectionLease = selectedRoom.BeginLease(false);
+            Debug.Assert(selectionLease != null);
+            selectionLease.Value = room;
 
             this.Push(CreateRoomSubScreen(room));
         }