From cbac4de9c2a3207fe40144abfc8cadf95fe1f4bd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Feb 2018 19:11:29 +0900
Subject: [PATCH] Expire + dispose CaptureBoxes

---
 osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs     | 3 ++-
 osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs b/osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs
index 35e425c981..48f6393ccc 100644
--- a/osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs
+++ b/osu.Game/Rulesets/Edit/Layers/Selection/CaptureBox.cs
@@ -60,8 +60,9 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
             Position = topLeft;
         }
 
-        protected override void PopIn() => this.FadeIn();
+        public override bool DisposeOnDeathRemoval => true;
 
+        protected override void PopIn() => this.FadeIn();
         protected override void PopOut() => this.FadeOut();
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs b/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs
index af6a4144fd..bda613f617 100644
--- a/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs
+++ b/osu.Game/Rulesets/Edit/Layers/Selection/SelectionLayer.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Rulesets.Edit.Layers.Selection
         {
             selectedHitObjects.Clear();
             captureBox?.Hide();
+            captureBox?.Expire();
         }
 
         /// <summary>