oop

Flutterish · Sep 3, 2022 · 44efff8 · 44efff8
1 parent dc582c9
commit 44efff8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/osu.Game.Rulesets.RurusettoAddon/RurusettoIcon.cs b/osu.Game.Rulesets.RurusettoAddon/RurusettoIcon.cs
@@ -82,7 +82,7 @@ void errDefer ( Action action ) {
 			}
 
             overlayContent.Add( overlay );
-            errDefer( () => overlayContent.Remove( overlay ) );
+            errDefer( () => overlayContent.Remove( overlay, false ) );
 
             // https://github.com/ppy/osu/blob/edf5e558aca6cd75e70b510a5f0dd233d6cfcb90/osu.Game/Overlays/Toolbar/Toolbar.cs#L89
             // leveraging an "easy" hack to get the container with toolbar buttons
@@ -95,7 +95,7 @@ void errDefer ( Action action ) {
 
             var button = new RurusettoToolbarButton();
             buttonsContainer.Insert( -1, button );
-            errDefer( () => buttonsContainer.Remove( button ) );
+            errDefer( () => buttonsContainer.Remove( button, false ) );
 
             // https://github.com/ppy/osu/blob/edf5e558aca6cd75e70b510a5f0dd233d6cfcb90/osu.Game/OsuGame.cs#L855
             // add overlay hiding, since osu does it manually

diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/Listing/ListingTab.cs b/osu.Game.Rulesets.RurusettoAddon/UI/Listing/ListingTab.cs
@@ -98,9 +98,9 @@ public override void Add ( DrawableListingEntry drawable ) {
 			rulesets.Add( drawable, drawable.Ruleset );
 		}
 
-		public override bool Remove ( DrawableListingEntry drawable ) {
+		public override bool Remove ( DrawableListingEntry drawable, bool disposeImmediately ) {
 			rulesets.Remove( drawable );
-			return base.Remove( drawable );
+			return base.Remove( drawable, disposeImmediately );
 		}
 	}
 }
diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/Overlay/RurusettoOverlay.cs b/osu.Game.Rulesets.RurusettoAddon/UI/Overlay/RurusettoOverlay.cs
@@ -159,7 +159,7 @@ protected override void PopOutComplete () {
 
 		if ( Header.Current.Value.Tab is null && Header.CurrentCategory.Value == Header.ListingTab.Category ) {
 			foreach ( var i in infoTabs ) {
-				tabContainer.Remove( i.Value );
+				tabContainer.Remove( i.Value, false );
 				i.Value.Dispose();
 			}
 			userTabs.Clear();

diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/RulesetLogo.cs b/osu.Game.Rulesets.RurusettoAddon/UI/RulesetLogo.cs
@@ -29,7 +29,7 @@ private void load ( OverlayColourProvider colours ) {
 				AddInternal( logo );
 			}
 			catch {
-				RemoveInternal( logo );
+				RemoveInternal( logo, false );
 				ruleset.RequestDarkLogo( AddInternal, AddInternal, useLocalIcon: false );
 			}
 		}, fallback => AddInternal( fallback ) );

diff --git a/osu.Game.Rulesets.RurusettoAddon/osu.Game.Rulesets.RurusettoAddon.csproj b/osu.Game.Rulesets.RurusettoAddon/osu.Game.Rulesets.RurusettoAddon.csproj
@@ -18,6 +18,6 @@
     <None Remove="Resources\Textures\oh_no.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2022.902.2" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.902.1" />
   </ItemGroup>
 </Project>