Bunch of null refs

Geeksltd · Dec 28, 2023 · ab9296a · ab9296a
1 parent 8211d28
commit ab9296a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Core/UI.Core/View.Binding.cs b/Core/UI.Core/View.Binding.cs
@@ -34,7 +34,7 @@ public static TView Bind<TView, TSource, TProperty>(this TView @this, Func<TView
 
     partial class View
     {
-        ConcurrentList<DynamicPropertyBinding> DynamicBindings = new();
+        readonly ConcurrentList<DynamicPropertyBinding> DynamicBindings = new();
 
         internal void RegisterPropertyBinding(DynamicPropertyBinding definition)
         {

diff --git a/Core/UI.Core/ViewExtensions.cs b/Core/UI.Core/ViewExtensions.cs
@@ -63,7 +63,7 @@ public static async Task<TView> MoveTo<TView>(this TView @this, View newParent,
             if (@this.IsRendered())
                 UIWorkBatch.Publish(@this, "[REMOVE]", null);
 
-            @this.parent.AllChildren?.Remove(@this);
+            @this.parent?.AllChildren?.Remove(@this);
             await newParent.AddAt(at, @this);
 
             return @this;

diff --git a/Zebble/UWP/Controls/UWPScrollView.cs b/Zebble/UWP/Controls/UWPScrollView.cs
@@ -286,7 +286,7 @@ async Task Snap(int index)
         void AutoMoveTo(double? horizontal = null, double? vertical = null, bool animate = true)
         {
             IsMovingByCode = true;
-            Result.ChangeView(horizontal, verticalOffset: vertical, zoomFactor: null, disableAnimation: !animate);
+            Result?.ChangeView(horizontal, verticalOffset: vertical, zoomFactor: null, disableAnimation: !animate);
         }
 
         public void Dispose()

diff --git a/Zebble/Zebble.csproj b/Zebble/Zebble.csproj
@@ -7,7 +7,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>4.6.119.0</Version>
+    <Version>4.6.120.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>