Browse Source

Merge pull request #964 from PixiEditor/fixes/10.06.2025

Null check
Krzysztof Krysiński 2 months ago
parent
commit
ec4d85c3f3

+ 6 - 0
src/PixiEditor.UI.Common/Controls/NumberInput.cs

@@ -314,6 +314,12 @@ public partial class NumberInput : TextBox
 
 
     private static bool TryParse(string s, out double value)
     private static bool TryParse(string s, out double value)
     {
     {
+        if (s == null)
+        {
+            value = 0;
+            return false;
+        }
+
         s = s.Replace(",", ".");
         s = s.Replace(",", ".");
 
 
         if (double.TryParse(s, NumberStyles.Float, CultureInfo.InvariantCulture, out value))
         if (double.TryParse(s, NumberStyles.Float, CultureInfo.InvariantCulture, out value))

+ 2 - 2
src/PixiEditor/Views/Animations/Timeline.cs

@@ -300,9 +300,9 @@ internal class Timeline : TemplatedControl, INotifyPropertyChanged
     {
     {
         if (dragged)
         if (dragged)
         {
         {
-            if (draggedKeyFrames.Length > 0)
+            if (draggedKeyFrames is { Length: > 0 })
             {
             {
-                ChangeKeyFramesLengthCommand.Execute((draggedKeyFrames.ToArray(), 0, true));
+                ChangeKeyFramesLengthCommand?.Execute((draggedKeyFrames.ToArray(), 0, true));
             }
             }
         }
         }