From 401dd2db37a55460a8f1332daa3d174e59f14a41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 16:55:00 +0900
Subject: [PATCH 1/3] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 1d2cf22b28..2d531cf01e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1009.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1019.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 133855c6c4..de7bde824f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1009.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1019.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 73faa8541e..9c22dec330 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1009.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1019.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1016.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1009.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1019.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 79a17b23715b9fe0982d11975494de0cb43413da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 16:57:08 +0900
Subject: [PATCH 2/3] Reapply waveform colour fix

---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index be3bca3242..9aff4ddf8f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         waveform = new WaveformGraph
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = colours.Blue.Opacity(0.2f),
+                            BaseColour = colours.Blue.Opacity(0.2f),
                             LowColour = colours.BlueLighter,
                             MidColour = colours.BlueDark,
                             HighColour = colours.BlueDarker,

From 4024b44a53b0642bb15a18871caa9ecd80342925 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 17:41:21 +0900
Subject: [PATCH 3/3] Fix unsafe manipulation of parent's children from child

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 9289a6162c..a221ca7966 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -145,11 +145,19 @@ namespace osu.Game.Rulesets.Catch.UI
                 }
             };
 
-            trailsTarget.Add(trails = new CatcherTrailDisplay(this));
+            trails = new CatcherTrailDisplay(this);
 
             updateCatcher();
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // don't add in above load as we may potentially modify a parent in an unsafe manner.
+            trailsTarget.Add(trails);
+        }
+
         /// <summary>
         /// Creates proxied content to be displayed beneath hitobjects.
         /// </summary>