Merge branch 'master' into polygon-tool

ppy · Aug 19, 2024 · 7248c04 · 7248c04
2 parents f34132f + 95d0633
commit 7248c04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -71,7 +71,7 @@ protected override IEnumerable<TernaryButton> CreateTernaryButtons()
         protected readonly OsuGridToolboxGroup OsuGridToolboxGroup = new OsuGridToolboxGroup();
 
         [Cached]
-        protected readonly FreehandSliderToolboxGroup FreehandlSliderToolboxGroup = new FreehandSliderToolboxGroup();
+        protected readonly FreehandSliderToolboxGroup FreehandSliderToolboxGroup = new FreehandSliderToolboxGroup();
 
         [BackgroundDependencyLoader]
         private void load()
@@ -111,7 +111,7 @@ private void load()
                         ScaleHandler = (OsuSelectionScaleHandler)BlueprintContainer.SelectionHandler.ScaleHandler,
                     },
                     new GenerateToolboxGroup(),
-                    FreehandlSliderToolboxGroup
+                    FreehandSliderToolboxGroup
                 }
             );
         }

diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -208,6 +208,9 @@ public void ChangeUserBeatmapAvailability(int userId, BeatmapAvailability newBea
 
         protected override async Task<MultiplayerRoom> JoinRoom(long roomId, string? password = null)
         {
+            if (RoomJoined || ServerAPIRoom != null)
+                throw new InvalidOperationException("Already joined a room");
+
             roomId = clone(roomId);
             password = clone(password);
 
@@ -260,6 +263,8 @@ protected override void OnRoomJoined()
         protected override Task LeaveRoomInternal()
         {
             RoomJoined = false;
+            ServerAPIRoom = null;
+            ServerRoom = null;
             return Task.CompletedTask;
         }