From f3b22eac0566147e8f595b117173f01846caa2ff Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 30 Aug 2021 09:30:27 -0400
Subject: [PATCH] Merge pull request #6495 from
 workgroupengineering/fixes/Datagrid_Warnings

Fixes datagrid warnings
---
 .../Collections/DataGridGroupDescription.cs         |  7 +++++--
 .../Utils/CellEditBinding.cs                        | 13 +++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs b/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs
index 9d8ebbfac1..587dd228a3 100644
--- a/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs
+++ b/src/Avalonia.Controls.DataGrid/Collections/DataGridGroupDescription.cs
@@ -83,8 +83,9 @@ namespace Avalonia.Collections
             if (key == null)
                 key = item;
 
-            if (_valueConverter != null)
-                key = _valueConverter.Convert(key, typeof(object), level, culture);
+            var valueConverter = ValueConverter;
+            if (valueConverter != null)
+                key = valueConverter.Convert(key, typeof(object), level, culture);
 
             return key;
         }
@@ -99,6 +100,8 @@ namespace Avalonia.Collections
         }
         public override string PropertyName => _propertyPath;
 
+        public IValueConverter ValueConverter { get => _valueConverter; set => _valueConverter = value; }
+
         private Type GetPropertyType(object o)
         {
             return o.GetType().GetNestedPropertyType(_propertyPath);
diff --git a/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs b/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
index 6ac77fbb99..1d1a595ccf 100644
--- a/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
+++ b/src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
@@ -1,10 +1,8 @@
 using Avalonia.Data;
 using Avalonia.Reactive;
 using System;
-using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 using System.Reactive.Subjects;
-using System.Text;
 
 namespace Avalonia.Controls.Utils
 {
@@ -67,11 +65,14 @@ namespace Avalonia.Controls.Utils
 
             private void SetSourceValue(object value)
             {
-                _settingSourceValue = true;
+                if (!_settingSourceValue)
+                {
+                    _settingSourceValue = true;
 
-                _sourceSubject.OnNext(value);
+                    _sourceSubject.OnNext(value);
 
-                _settingSourceValue = false;
+                    _settingSourceValue = false;
+                }
             }
             private void SetControlValue(object value)
             {
@@ -157,4 +158,4 @@ namespace Avalonia.Controls.Utils
             }
         }
     }
-}
\ No newline at end of file
+}