From 5fa93f4a050263be0a2a546bcbfbd1bbc97e2771 Mon Sep 17 00:00:00 2001
From: David Zhao <nyquill@ppy.sh>
Date: Fri, 5 Apr 2019 15:05:11 +0900
Subject: [PATCH] Add test for checking exception

---
 .../UserInterface/TestCaseLogoTrackingContainer.cs   | 12 +++++++++++-
 .../Graphics/Containers/LogoTrackingContainer.cs     | 11 +++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestCaseLogoTrackingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestCaseLogoTrackingContainer.cs
index 4d255eb25a..3b57d892ad 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestCaseLogoTrackingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestCaseLogoTrackingContainer.cs
@@ -186,7 +186,17 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void SetFacadeSizeTest()
         {
             AddStep("Add tracking containers", addFacadeContainers);
-            AddStep("Break shit", () => { logoFacade.Size = new Vector2(0, 0); });
+            AddStep("Break stuff", () => { logoFacade.Size = new Vector2(0, 0); });
+        }
+
+        [Test]
+        public void SetMultipleContainers()
+        {
+            LogoTrackingContainer newContainer = new LogoTrackingContainer();
+            AddStep("Add tracking containers", addFacadeContainers);
+            AddStep("Move facade to random position", startTrackingRandom);
+            AddStep("Add logo to new container", () => newContainer.SetLogo(logo));
+            AddStep("Break stuff", () => newContainer.Tracking = true);
         }
 
         private void addFacadeContainers()
diff --git a/osu.Game/Graphics/Containers/LogoTrackingContainer.cs b/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
index ee6d5dec20..ab6f7ebc2a 100644
--- a/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
+++ b/osu.Game/Graphics/Containers/LogoTrackingContainer.cs
@@ -12,7 +12,7 @@ using osuTK;
 namespace osu.Game.Graphics.Containers
 {
     /// <summary>
-    /// A container that handles tracking of an <see cref="OsuLogo"/> through different layout scenarios
+    /// A container that handles tracking of an <see cref="OsuLogo"/> through different layout scenarios.
     /// </summary>
     public class LogoTrackingContainer : Container
     {
@@ -38,8 +38,6 @@ namespace osu.Game.Graphics.Containers
             }
         }
 
-        private bool tracking;
-
         protected OsuLogo Logo;
 
         private float facadeScale;
@@ -47,6 +45,7 @@ namespace osu.Game.Graphics.Containers
         private Vector2? startPosition;
         private double? startTime;
         private double duration;
+        private bool tracking;
 
         public LogoTrackingContainer()
         {
@@ -69,7 +68,11 @@ namespace osu.Game.Graphics.Containers
             }
 
             Logo = logo ?? throw new ArgumentNullException(nameof(logo));
-            Logo.IsTracking = Tracking;
+
+            if (Tracking)
+            {
+                Logo.IsTracking = true;
+            }
 
             this.facadeScale = facadeScale;
             this.duration = duration;