Merge branch 'fix-main-menu-storyboard-crash' into release

Closes #20413.

osu.Android.props

@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.922.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.916.1" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->

osu.Game/OsuGame.cs

@@ -24,7 +24,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
@@ -1039,48 +1038,50 @@ namespace osu.Game
 
         private void forwardTabletLogsToNotifications()
         {
-            const string tablet_prefix = @"[Tablet] ";
-            bool notifyOnWarning = true;
+            // Temporarily disabled due to framework downgrade.
 
-            Logger.NewEntry += entry =>
-            {
-                if (entry.Level < LogLevel.Important || entry.Target != LoggingTarget.Input || !entry.Message.StartsWith(tablet_prefix, StringComparison.OrdinalIgnoreCase))
-                    return;
-
-                string message = entry.Message.Replace(tablet_prefix, string.Empty);
-
-                if (entry.Level == LogLevel.Error)
-                {
-                    Schedule(() => Notifications.Post(new SimpleNotification
-                    {
-                        Text = $"Encountered tablet error: \"{message}\"",
-                        Icon = FontAwesome.Solid.PenSquare,
-                        IconColour = Colours.RedDark,
-                    }));
-                }
-                else if (notifyOnWarning)
-                {
-                    Schedule(() => Notifications.Post(new SimpleNotification
-                    {
-                        Text = @"Encountered tablet warning, your tablet may not function correctly. Click here for a list of all tablets supported.",
-                        Icon = FontAwesome.Solid.PenSquare,
-                        IconColour = Colours.YellowDark,
-                        Activated = () =>
-                        {
-                            OpenUrlExternally("https://opentabletdriver.net/Tablets", true);
-                            return true;
-                        }
-                    }));
-
-                    notifyOnWarning = false;
-                }
-            };
-
-            Schedule(() =>
-            {
-                ITabletHandler tablet = Host.AvailableInputHandlers.OfType<ITabletHandler>().SingleOrDefault();
-                tablet?.Tablet.BindValueChanged(_ => notifyOnWarning = true, true);
-            });
+            // const string tablet_prefix = @"[Tablet] ";
+            // bool notifyOnWarning = true;
+            //
+            // Logger.NewEntry += entry =>
+            // {
+            //     if (entry.Level < LogLevel.Important || entry.Target != LoggingTarget.Input || !entry.Message.StartsWith(tablet_prefix, StringComparison.OrdinalIgnoreCase))
+            //         return;
+            //
+            //     string message = entry.Message.Replace(tablet_prefix, string.Empty);
+            //
+            //     if (entry.Level == LogLevel.Error)
+            //     {
+            //         Schedule(() => Notifications.Post(new SimpleNotification
+            //         {
+            //             Text = $"Encountered tablet error: \"{message}\"",
+            //             Icon = FontAwesome.Solid.PenSquare,
+            //             IconColour = Colours.RedDark,
+            //         }));
+            //     }
+            //     else if (notifyOnWarning)
+            //     {
+            //         Schedule(() => Notifications.Post(new SimpleNotification
+            //         {
+            //             Text = @"Encountered tablet warning, your tablet may not function correctly. Click here for a list of all tablets supported.",
+            //             Icon = FontAwesome.Solid.PenSquare,
+            //             IconColour = Colours.YellowDark,
+            //             Activated = () =>
+            //             {
+            //                 OpenUrlExternally("https://opentabletdriver.net/Tablets", true);
+            //                 return true;
+            //             }
+            //         }));
+            //
+            //         notifyOnWarning = false;
+            //     }
+            // };
+            //
+            // Schedule(() =>
+            // {
+            //     ITabletHandler tablet = Host.AvailableInputHandlers.OfType<ITabletHandler>().SingleOrDefault();
+            //     tablet?.Tablet.BindValueChanged(_ => notifyOnWarning = true, true);
+            // });
         }
 
         private Task asyncLoadStream;

osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs

@@ -424,7 +424,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             private void hideError() => ErrorText.FadeOut(50);
 
-            private void onSuccess(Room room)
+            private void onSuccess(Room room) => Schedule(() =>
             {
                 Debug.Assert(applyingSettingsOperation != null);
 
@@ -432,9 +432,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 applyingSettingsOperation.Dispose();
                 applyingSettingsOperation = null;
-            }
+            });
 
-            private void onError(string text)
+            private void onError(string text) => Schedule(() =>
             {
                 Debug.Assert(applyingSettingsOperation != null);
 
@@ -455,7 +455,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 applyingSettingsOperation.Dispose();
                 applyingSettingsOperation = null;
-            }
+            });
         }
 
         public class CreateOrUpdateButton : TriangleButton

osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs

@@ -153,10 +153,11 @@ namespace osu.Game.Screens.Select.Leaderboards
 
             var req = new GetScoresRequest(fetchBeatmapInfo, fetchRuleset, Scope, requestMods);
 
-            req.Success += r => SetScores(
+            // Schedule is required to avoid potential object disposed exception when LoadComponentAsync is eventually called.
+            req.Success += r => Schedule(() => SetScores(
                 scoreManager.OrderByTotalScore(r.Scores.Select(s => s.ToScoreInfo(rulesets, fetchBeatmapInfo))),
                 r.UserScore?.CreateScoreInfo(rulesets, fetchBeatmapInfo)
-            );
+            ));
 
             return req;
         }

osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs

@@ -10,7 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Utils;
-using osu.Game.Screens.Play;
+using osu.Game.Beatmaps;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -91,6 +91,9 @@ namespace osu.Game.Storyboards.Drawables
         [Resolved]
         private ISkinSource skin { get; set; }
 
+        [Resolved]
+        private IBeatSyncProvider beatSyncProvider { get; set; }
+
         [BackgroundDependencyLoader]
         private void load(TextureStore textureStore, Storyboard storyboard)
         {
@@ -116,9 +119,6 @@ namespace osu.Game.Storyboards.Drawables
             Animation.ApplyTransforms(this);
         }
 
-        [Resolved]
-        private IGameplayClock gameplayClock { get; set; }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -128,7 +128,7 @@ namespace osu.Game.Storyboards.Drawables
             //
             // In the case of storyboard animations, we want to synchronise with game time perfectly
             // so let's get a correct time based on gameplay clock and earliest transform.
-            PlaybackPosition = gameplayClock.CurrentTime - Animation.EarliestTransformTime;
+            PlaybackPosition = (beatSyncProvider?.Clock?.CurrentTime ?? Clock.CurrentTime) - Animation.EarliestTransformTime;
         }
 
         private void skinSourceChanged()

osu.Game/osu.Game.csproj

@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.15.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.922.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.916.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
     <PackageReference Include="Sentry" Version="3.20.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />

osu.iOS.props

@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.922.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.916.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.831.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -82,7 +82,7 @@
     <PackageReference Include="DiffPlex" Version="1.7.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.922.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.916.1" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />