From 3a3ec1436b8a35323d6b731f3c6575214ffb8557 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Nov 2021 09:14:50 +0300
Subject: [PATCH] Re-enable possible null refernece exception inspections and
 move code

---
 .../Overlays/Changelog/ChangelogHeader.cs     | 53 ++++++++++---------
 osu.Game/Overlays/Comments/CommentEditor.cs   | 12 +++--
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 69a8cb2ce0..1b120ef57c 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -38,14 +38,6 @@ namespace osu.Game.Overlays.Changelog
             };
 
             Build.ValueChanged += showBuild;
-
-            // ReSharper disable once PossibleNullReferenceException
-            // see https://youtrack.jetbrains.com/issue/RSRP-486768
-            Streams.Current.ValueChanged += e =>
-            {
-                if (e.NewValue?.LatestBuild != null && !e.NewValue.Equals(Build.Value?.UpdateStream))
-                    Build.Value = e.NewValue.LatestBuild;
-            };
         }
 
         [BackgroundDependencyLoader]
@@ -75,29 +67,40 @@ namespace osu.Game.Overlays.Changelog
 
         protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/changelog");
 
-        protected override Drawable CreateContent() => new Container
+        protected override Drawable CreateContent()
         {
-            RelativeSizeAxes = Axes.X,
-            AutoSizeAxes = Axes.Y,
-            Children = new Drawable[]
+            var content = new Container
             {
-                streamsBackground = new Box
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding
+                    streamsBackground = new Box
                     {
-                        Horizontal = 65,
-                        Vertical = 20
+                        RelativeSizeAxes = Axes.Both
                     },
-                    Child = Streams = new ChangelogUpdateStreamControl()
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding
+                        {
+                            Horizontal = 65,
+                            Vertical = 20
+                        },
+                        Child = Streams = new ChangelogUpdateStreamControl()
+                    }
                 }
-            }
-        };
+            };
+
+            Streams.Current.ValueChanged += e =>
+            {
+                if (e.NewValue?.LatestBuild != null && !e.NewValue.Equals(Build.Value?.UpdateStream))
+                    Build.Value = e.NewValue.LatestBuild;
+            };
+
+            return content;
+        }
 
         protected override OverlayTitle CreateTitle() => new ChangelogHeaderTitle();
 
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 1f3931901c..1847de8660 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -175,6 +175,8 @@ namespace osu.Game.Overlays.Comments
 
             protected override IEnumerable<Drawable> EffectTargets => new[] { background };
 
+            private readonly string text;
+
             [Resolved]
             private OverlayColourProvider colourProvider { get; set; }
 
@@ -184,12 +186,10 @@ namespace osu.Game.Overlays.Comments
 
             public CommitButton(string text)
             {
+                this.text = text;
+
                 AutoSizeAxes = Axes.Both;
                 LoadingAnimationSize = new Vector2(10);
-
-                // ReSharper disable once PossibleNullReferenceException
-                // see https://youtrack.jetbrains.com/issue/RSRP-486768
-                drawableText.Text = text;
             }
 
             [BackgroundDependencyLoader]
@@ -198,6 +198,8 @@ namespace osu.Game.Overlays.Comments
                 IdleColour = colourProvider.Light4;
                 HoverColour = colourProvider.Light3;
                 blockedBackground.Colour = colourProvider.Background5;
+
+                drawableText.Text = text;
             }
 
             protected override void LoadComplete()
@@ -234,7 +236,7 @@ namespace osu.Game.Overlays.Comments
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                        Margin = new MarginPadding { Horizontal = 20 }
+                        Margin = new MarginPadding { Horizontal = 20 },
                     }
                 }
             };