diff --git a/Ink Canvas/Helpers/InkRecognizeHelper.cs b/Ink Canvas/Helpers/InkRecognizeHelper.cs index d283aaa5..cb527b78 100644 --- a/Ink Canvas/Helpers/InkRecognizeHelper.cs +++ b/Ink Canvas/Helpers/InkRecognizeHelper.cs @@ -152,6 +152,9 @@ namespace Ink_Canvas.Helpers var node = legacy.InkDrawingNode; var shape = node.GetShape(); + if (shape == null) + return InkShapeRecognitionResult.Empty; + var hot = ClonePointCollection(node.HotPoints); return new InkShapeRecognitionResult( node.GetShapeName(), @@ -173,6 +176,9 @@ namespace Ink_Canvas.Helpers public static bool IsContainShapeType(string name) { + if (string.IsNullOrEmpty(name)) + return false; + if (name.Contains("Triangle") || name.Contains("Circle") || name.Contains("Rectangle") || name.Contains("Diamond") || name.Contains("Parallelogram") || name.Contains("Square") diff --git a/Ink Canvas/Helpers/WinRtInkShapeRecognizer.cs b/Ink Canvas/Helpers/WinRtInkShapeRecognizer.cs index c39a3621..687d6980 100644 --- a/Ink Canvas/Helpers/WinRtInkShapeRecognizer.cs +++ b/Ink Canvas/Helpers/WinRtInkShapeRecognizer.cs @@ -124,6 +124,9 @@ namespace Ink_Canvas.Helpers return null; var da = stroke.DrawingAttributes; + if (da == null) + return null; + var wda = new global::Windows.UI.Input.Inking.InkDrawingAttributes { PenTip = global::Windows.UI.Input.Inking.PenTipShape.Circle, diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 74a96de9..10e42eae 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -4492,6 +4492,9 @@ namespace Ink_Canvas { try { + if (!IsLoaded) + return; + if (Settings.ModeSettings.IsPPTOnlyMode) { if (TrayTemporaryShowUntilUtc.HasValue && DateTime.UtcNow < TrayTemporaryShowUntilUtc.Value)