From 365c1bccc67764695e940006176ab1b676eedee0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Aug 2021 18:24:19 +0900
Subject: [PATCH] Fix multiplayer channel being unintentionally left after
 gameplay session

---
 .../OnlinePlay/Match/Components/MatchChatDisplay.cs      | 9 +++++++--
 .../OnlinePlay/Multiplayer/GameplayChatDisplay.cs        | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index a96d64cb5d..5f960c1b5c 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -19,9 +19,12 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
         [Resolved(CanBeNull = true)]
         private ChannelManager channelManager { get; set; }
 
-        public MatchChatDisplay()
+        private readonly bool leaveChannelOnDispose;
+
+        public MatchChatDisplay(bool leaveChannelOnDispose = true)
             : base(true)
         {
+            this.leaveChannelOnDispose = leaveChannelOnDispose;
         }
 
         protected override void LoadComplete()
@@ -42,7 +45,9 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            channelManager?.LeaveChannel(Channel.Value);
+
+            if (leaveChannelOnDispose)
+                channelManager?.LeaveChannel(Channel.Value);
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayChatDisplay.cs
index 6a2609480e..94542fb804 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayChatDisplay.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private const float height = 100;
 
         public GameplayChatDisplay()
+            : base(leaveChannelOnDispose: false)
         {
             RelativeSizeAxes = Axes.X;