From 36c557c752be5bdecb37b9e761c6ad4551e47c12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Jul 2019 18:39:33 +0900
Subject: [PATCH] Add null check and simplify scaling conditional logic via
 switch

---
 osu.Game/Skinning/SkinnableDrawable.cs | 33 ++++++++++++++++----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index 5d1ca98bfd..eb0508b568 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -84,7 +84,6 @@ namespace osu.Game.Skinning
                 scaling.Invalidate();
                 Drawable.Origin = Anchor.Centre;
                 Drawable.Anchor = Anchor.Centre;
-
                 InternalChild = Drawable;
             }
             else
@@ -97,21 +96,31 @@ namespace osu.Game.Skinning
 
             if (!scaling.IsValid)
             {
-                if (Drawable != null && confineMode != ConfineMode.NoScaling && (!isDefault || ApplySizeRestrictionsToDefault))
+                try
                 {
-                    bool applyScaling = confineMode == ConfineMode.ScaleToFit ||
-                                        (confineMode == ConfineMode.ScaleDownToFit && (Drawable.DrawSize.X > DrawSize.X || Drawable.DrawSize.Y > DrawSize.Y));
+                    if (Drawable == null || (isDefault && !ApplySizeRestrictionsToDefault)) return;
 
-                    if (applyScaling)
+                    switch (confineMode)
                     {
-                        Drawable.RelativeSizeAxes = Axes.Both;
-                        Drawable.Size = Vector2.One;
-                        Drawable.Scale = Vector2.One;
-                        Drawable.FillMode = FillMode.Fit;
-                    }
-                }
+                        case ConfineMode.NoScaling:
+                            return;
 
-                scaling.Validate();
+                        case ConfineMode.ScaleDownToFit:
+                            if (Drawable.DrawSize.X <= DrawSize.X && Drawable.DrawSize.Y <= DrawSize.Y)
+                                return;
+
+                            break;
+                    }
+
+                    Drawable.RelativeSizeAxes = Axes.Both;
+                    Drawable.Size = Vector2.One;
+                    Drawable.Scale = Vector2.One;
+                    Drawable.FillMode = FillMode.Fit;
+                }
+                finally
+                {
+                    scaling.Validate();
+                }
             }
         }
     }