Merge branch 'master' into fix-perform-from-menu-nullref

osu.Game/Online/Multiplayer/MultiplayerRoom.cs

@@ -5,9 +5,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using Newtonsoft.Json;
-using osu.Framework.Allocation;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -48,27 +46,6 @@ namespace osu.Game.Online.Multiplayer
             RoomID = roomId;
         }
 
-        private object updateLock = new object();
-
-        private ManualResetEventSlim freeForWrite = new ManualResetEventSlim(true);
-
-        /// <summary>
-        /// Request a lock on this room to perform a thread-safe update.
-        /// </summary>
-        public IDisposable LockForUpdate()
-        {
-            // ReSharper disable once InconsistentlySynchronizedField
-            freeForWrite.Wait();
-
-            lock (updateLock)
-            {
-                freeForWrite.Wait();
-                freeForWrite.Reset();
-
-                return new ValueInvokeOnDisposal<MultiplayerRoom>(this, r => freeForWrite.Set());
-            }
-        }
-
         public override string ToString() => $"RoomID:{RoomID} Host:{Host?.UserID} Users:{Users.Count} State:{State} Settings: [{Settings}]";
     }
 }

osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs

@@ -7,12 +7,11 @@ namespace osu.Game.Overlays.Changelog
 {
     public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
     {
-        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
+        public ChangelogUpdateStreamControl()
-
-        protected override void LoadComplete()
         {
-            // suppress base logic of immediately selecting first item if one exists
+            SelectFirstTabByDefault = false;
-            // (we always want to start with no stream selected).
         }
+
+        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
     }
 }