Fix potential null reference issue with re-templated InfiniteCanvas

michael-hawker · michael-hawker · commit 8272585be33c · 2020-03-24T16:02:42.000-07:00
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs
@@ -116,7 +116,10 @@ private void CanvasTextBoxColorPicker_ColorChanged(ColorPicker sender, ColorChan
                 ReDrawCanvas();
             }
 
-            _fontColorIcon.Foreground = new SolidColorBrush(_canvasTextBoxColorPicker.Color);
+            if (_fontColorIcon != null)
+            {
+                _fontColorIcon.Foreground = new SolidColorBrush(_canvasTextBoxColorPicker.Color);
+            }
         }
 
         private void CanvasTextBox_TextChanged(object sender, string text)

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,10 @@ private void CanvasTextBoxColorPicker_ColorChanged(ColorPicker sender, ColorChan`
`116`	`116`	`ReDrawCanvas();`
`117`	`117`	`}`
`118`	`118`
`119`		`- _fontColorIcon.Foreground = new SolidColorBrush(_canvasTextBoxColorPicker.Color);`
	`119`	`+ if (_fontColorIcon != null)`
	`120`	`+ {`
	`121`	`+ _fontColorIcon.Foreground = new SolidColorBrush(_canvasTextBoxColorPicker.Color);`
	`122`	`+ }`
`120`	`123`	`}`
`121`	`124`
`122`	`125`	`private void CanvasTextBox_TextChanged(object sender, string text)`