From 60b781701fb03854a19c6f3b9f7ebaac5249234b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 30 May 2021 14:20:03 +0300
Subject: [PATCH] Rewrite catch combo counter hide logic

---
 .../Skinning/Legacy/CatchLegacySkinTransformer.cs        | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
index 05580f6d06..802de55b7b 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
@@ -29,20 +29,17 @@ public override Drawable GetDrawableComponent(ISkinComponent component)
                 switch (targetComponent.Target)
                 {
                     case SkinnableTarget.MainHUDComponents:
-                        if (!providesComboCounter)
-                            break;
+                        var components = Source.GetDrawableComponent(component) as SkinnableTargetComponentsContainer;
 
-                        if (Source.GetDrawableComponent(component) is SkinnableTargetComponentsContainer components)
+                        if (providesComboCounter && components != null)
                         {
                             // catch may provide its own combo counter; hide the default.
                             // todo: this should be done in an elegant way per ruleset, defining which HUD skin components should be displayed.
                             foreach (var legacyComboCounter in components.OfType<LegacyComboCounter>())
                                 legacyComboCounter.ContentVisible = false;
-
-                            return components;
                         }
 
-                        break;
+                        return components;
                 }
             }