From 9e5050cab99a0a55fbfb07ac12998feb18765df1 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Fri, 24 Dec 2021 00:16:34 +0300
Subject: [PATCH] Fixed some of Rider's complaints

---
 src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs        | 2 +-
 .../Media/TextFormatting/Unicode/LineBreakEnumerator.cs       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs b/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
index 66223e513d..88b1e3c807 100644
--- a/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
+++ b/src/Avalonia.Base/Utilities/WeakSubscriptionManager.cs
@@ -180,7 +180,7 @@ namespace Avalonia.Utilities
                 {
                     var r = _data[c];
                     if (r?.TryGetTarget(out var sub) == true)
-                        sub.OnEvent(sender, eventArgs);
+                        sub!.OnEvent(sender, eventArgs);
                     else
                         needCompact = true;
                 }
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
index 40891a700d..0f6b81975a 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
@@ -80,12 +80,12 @@ namespace Avalonia.Media.TextFormatting.Unicode
                     }
                 }
 
-                var shouldBreak = GetSimpleBreak() ?? (bool?)GetPairTableBreak(lastClass);
+                var shouldBreak = GetSimpleBreak() ?? GetPairTableBreak(lastClass);
 
                 // Rule LB8a
                 _lb8a = _nextClass == LineBreakClass.ZWJ;
 
-                if (shouldBreak.Value)
+                if (shouldBreak)
                 {
                     Current = new LineBreak(FindPriorNonWhitespace(_lastPosition), _lastPosition);
                     return true;