Merge pull request #9080 from mono/jstedfast-debugger-updatepreviewicon-null-protect

slluis · web-flow · commit a6bc297edd0b · 2019-10-25T09:23:50.000+02:00
[Debugger] null-protect nameView.SetPreviewIcon() in case nameView is…
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacObjectValueTreeView.cs
@@ -636,7 +636,7 @@ void UpdatePreviewIcon (nint row, PreviewButtonIcon icon)
 			if (rowView != null) {
 				var nameView = (MacDebuggerObjectNameView) rowView.ViewAtColumn (0);
 
-				nameView.SetPreviewButtonIcon (icon);
+				nameView?.SetPreviewButtonIcon (icon);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ void UpdatePreviewIcon (nint row, PreviewButtonIcon icon)`
`636`	`636`	`if (rowView != null) {`
`637`	`637`	`var nameView = (MacDebuggerObjectNameView) rowView.ViewAtColumn (0);`
`638`	`638`
`639`		`- nameView.SetPreviewButtonIcon (icon);`
	`639`	`+ nameView?.SetPreviewButtonIcon (icon);`
`640`	`640`	`}`
`641`	`641`	`}`
`642`	`642`