Fix selector dismissal behaviour during user actions

Lawtrohux · May 9, 2022 · 2481201 · 2481201
1 parent ebb64d1
commit 2481201
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/osu.Game/Overlays/ChatOverlayV2.cs b/osu.Game/Overlays/ChatOverlayV2.cs
@@ -165,7 +165,12 @@ protected override void LoadComplete()
             };
             channelList.OnRequestLeave += channel => channelManager.LeaveChannel(channel);
 
-            channelListing.OnRequestJoin += channel => channelManager.JoinChannel(channel);
+            channelListing.OnRequestJoin += channel =>
+            {
+                channelManager.JoinChannel(channel);
+                // Manually joining a channel should keep the selector open
+                selectorActive.Value = true;
+            };
             channelListing.OnRequestLeave += channel => channelManager.LeaveChannel(channel);
 
             textBar.OnSearchTermsChanged += searchTerms => channelListing.SearchTerm = searchTerms;
@@ -255,6 +260,10 @@ private void currentChannelChanged(ValueChangedEvent<Channel> channel)
             // Channel is null when leaving the currently selected channel
             if (newChannel == null)
             {
+                // Don't need to autoswitch if the selector is visible
+                if (selectorActive.Value)
+                    return;
+
                 // Find another channel to switch to
                 newChannel = channelManager.JoinedChannels.FirstOrDefault(c => c != channel.OldValue);