Fix warnings

mysteryx93 · Jan 1, 2022 · ca4fa4b · ca4fa4b
1 parent b36c619
commit ca4fa4b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/Avalonia/Converters.cs b/Avalonia/Converters.cs
@@ -9,15 +9,15 @@ namespace HanumanInstitute.MediaPlayer.Avalonia;
 /// </summary>
 public class TimeSpanToDoubleConverter : IValueConverter
 {
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         var valueAdd = System.Convert.ToDouble(parameter, CultureInfo.InvariantCulture);
-        return ((TimeSpan)value).TotalSeconds + valueAdd;
+        return ((TimeSpan?) value)?.TotalSeconds + valueAdd ?? 0.0;
     }
 
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         var valueAdd = System.Convert.ToDouble(parameter, CultureInfo.InvariantCulture);
-        return TimeSpan.FromSeconds((double)value - valueAdd);
+        return value != null ? TimeSpan.FromSeconds((double)value - valueAdd) : TimeSpan.Zero;
     }
-}
+}
diff --git a/Avalonia/Helpers/Mvvm/RelayCommandGeneric.cs b/Avalonia/Helpers/Mvvm/RelayCommandGeneric.cs
@@ -101,15 +101,7 @@ public RelayCommand(Action<T> execute, Predicate<T>? canExecute)
         Justification = "This cannot be an event")]
     public void RaiseCanExecuteChanged()
     {
-#if SILVERLIGHT
-            var handler = CanExecuteChanged;
-            if (handler != null)
-            {
-                handler(this, EventArgs.Empty);
-            }
-#else
-        // CommandManager.InvalidateRequerySuggested();
-#endif
+        CanExecuteChanged?.Invoke(this, EventArgs.Empty);
     }
 
     /// <summary>
@@ -120,7 +112,7 @@ public void RaiseCanExecuteChanged()
     /// <returns>true if this command can be executed; otherwise, false.</returns>
     public bool CanExecute(object parameter)
     {
-        return _canExecute == null ? true : _canExecute((T)parameter);
+        return _canExecute?.Invoke((T)parameter) ?? true;
     }
 
     /// <summary>