Will this fix lyric display issue?

MATRIX-feather · Nov 15, 2024 · 61a42e1 · 61a42e1
1 parent 87fed91
commit 61a42e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/osu.Game.Rulesets.IGPlayer.sln.DotSettings b/osu.Game.Rulesets.IGPlayer.sln.DotSettings
@@ -802,6 +802,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

diff --git a/osu.Game.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/UI/LyricLineHandler.cs b/osu.Game.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/UI/LyricLineHandler.cs
@@ -67,7 +67,7 @@ public string Text
                         Margin = getMargin(false)
                     }, text =>
                     {
-                        if (tokenSource.Token.IsCancellationRequested)
+                        if (tokenSource.IsCancellationRequested)
                             return;
 
                         lyricContainer.Add(text);
@@ -113,15 +113,15 @@ public string TranslatedText
                         Margin = getMargin(true)
                     }, text =>
                     {
-                        if (tokenSource.Token.IsCancellationRequested)
+                        if (tokenSource.IsCancellationRequested)
                             return;
 
                         text.MoveToY(0, fadeInDuration.Value, fadeInEasing)
                             .FadeIn(fadeInDuration.Value, fadeInEasing);
 
                         lyricContainer.Add(text);
                         currentLineTranslated = text;
-                    });
+                    }, tokenSource.Token);
                 });
 
                 currentRawTranslateText = value;