Merge pull request #1946 from cwensley/curtis/wpf-current-transform

Fix possible NRE with Graphics.CurrentTransform
picoe · May 2, 2021 · 4b4de9b · 4b4de9b
2 parents 4a44f80 + b729d5c
commit 4b4de9b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Eto.Wpf/Drawing/GraphicsHandler.cs b/src/Eto.Wpf/Drawing/GraphicsHandler.cs
@@ -513,7 +513,7 @@ public void RestoreTransform()
 
 		public IMatrix CurrentTransform
 		{
-			get { return transforms.Current != null ? transforms.Current.Clone() : Matrix.Create(); }
+			get { return transforms?.Current?.Clone() ?? Matrix.Create(); }
 		}
 
 		void RewindOffset()