Remove GameState from GameAd when they leave

Author: carlbennett

src/Atlasd/Battlenet/Protocols/Game/Messages/SID_LEAVEGAME.cs

@@ -32,8 +32,17 @@ public override bool Invoke(MessageContext context)
                 throw new GameProtocolViolationException(context.Client, $"{MessageName(Id)} buffer must be 0 bytes, got {Buffer.Length}");
 
             GameState gs = context.Client.GameState;
-            if (gs.GameAd != null && gs.GameAd.RemoveClient(gs)) gs.GameAd = null;
 
+            if (gs == null)
+                throw new GameProtocolViolationException(context.Client, $"{MessageName(Id)} was received without an active GameState");
+
+            if (gs.GameAd == null)
+                return true; // No game advertisement to stop. No action to do.
+
+            bool gameAdOwner = gs.GameAd != null && gs.GameAd.Owner == gs;
+            if (gameAdOwner && gs.GameAd.Clients.Count == 1) Battlenet.Common.ActiveGameAds.Remove(gs.GameAd);
+
+            if (gs.GameAd != null && gs.GameAd.RemoveClient(gs)) gs.GameAd = null;
             return true;
         }
     }

src/Atlasd/Battlenet/Protocols/Game/Messages/SID_STOPADV.cs

@@ -38,13 +38,15 @@ public override bool Invoke(MessageContext context)
             if (gs.GameAd == null)
                 return true; // No game advertisement to stop. No action to do.
 
-            if (gs != gs.GameAd.Owner)
-            {
+            bool gameAdOwner = gs.GameAd != null && gs.GameAd.Owner == gs;
+
+            if (gs.GameAd != null && gs.GameAd.RemoveClient(gs)) gs.GameAd = null;
+
+            if (!gameAdOwner)
                 Logging.WriteLine(Logging.LogLevel.Info, Logging.LogType.Client_Game, context.Client.RemoteEndPoint, $"{MessageName(Id)} was received but they are not the owner of the game advertisement");
-                return true;
-            }
+            else
+                Battlenet.Common.ActiveGameAds.Remove(gs.GameAd);
 
-            Battlenet.Common.ActiveGameAds.Remove(gs.GameAd);
             return true;
         }
     }