Merge pull request #2116 from cwensley/curtis/fix-gridview-crash-with…

…-blank-values Mac: Fix crash when there are null values for TextBoxCell or ImageTextCell
picoe · Jan 17, 2022 · a83127a · a83127a
2 parents fd3b7a5 + 401e81a
commit a83127a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Eto.Mac/Forms/Cells/ImageTextCellHandler.cs b/src/Eto.Mac/Forms/Cells/ImageTextCellHandler.cs
@@ -189,7 +189,7 @@ public NSObject ObjectValue
 				{
 					var val = value as MacImageData;
 
-					TextField.ObjectValue = val?.Text ?? NSString.Empty;
+					TextField.ObjectValue = (NSString)(val?.Text ?? string.Empty);
 					Image = val?.Image;
 					_objectValue = value;
 				}

diff --git a/src/Eto.Mac/Forms/Cells/TextBoxCellHandler.cs b/src/Eto.Mac/Forms/Cells/TextBoxCellHandler.cs
@@ -57,9 +57,10 @@ public override NSObject GetObjectValue(object dataItem)
 			if (Widget.Binding != null)
 			{
 				var val = Widget.Binding.GetValue(dataItem);
-				return val != null ? new NSString(Convert.ToString(val)) : NSString.Empty;
+				var ret = val != null ? Convert.ToString(val) : string.Empty;
+				return (NSString)ret;
 			}
-			return NSString.Empty;
+			return (NSString)string.Empty;
 		}
 
 		public override void SetObjectValue(object dataItem, NSObject value)