Merge pull request #8885 from mono/jstedfast-debugger-font-nre-fix

slluis · web-flow · commit 994924160f06 · 2019-10-11T15:55:21.000+02:00
[Debugger] Fixed an NRE font crash
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectCellViewBase.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectCellViewBase.cs
@@ -157,6 +157,9 @@ protected void UpdateFont (NSControl control, int sizeDelta = 0)
 		{
 			var font = TreeView.CustomFont ?? TreeView.Font;
 
+			if (font == null)
+				return;
+
 			if (sizeDelta != 0) {
 				control.Font = NSFont.FromDescription (font.FontDescriptor, font.PointSize + sizeDelta);
 			} else {

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,9 @@ protected void UpdateFont (NSControl control, int sizeDelta = 0)`
`157`	`157`	`{`
`158`	`158`	`var font = TreeView.CustomFont ?? TreeView.Font;`
`159`	`159`
	`160`	`+ if (font == null)`
	`161`	`+ return;`
	`162`	`+`
`160`	`163`	`if (sizeDelta != 0) {`
`161`	`164`	`control.Font = NSFont.FromDescription (font.FontDescriptor, font.PointSize + sizeDelta);`
`162`	`165`	`} else {`