瀏覽代碼

null checks

Krzysztof Krysiński 5 月之前
父節點
當前提交
f3a3c71181
共有 1 個文件被更改,包括 6 次插入4 次删除
  1. 6 4
      src/PixiEditor/ViewModels/Document/DocumentManagerViewModel.cs

+ 6 - 4
src/PixiEditor/ViewModels/Document/DocumentManagerViewModel.cs

@@ -199,15 +199,17 @@ internal class DocumentManagerViewModel : SubViewModel<ViewModelMain>, IDocument
         if (ActiveDocument is null)
             return;
 
-        if (ActiveDocument.SelectionPathBindable is { IsEmpty: false })
+        if (ActiveDocument.SelectionPathBindable != null && ActiveDocument.SelectionPathBindable is { IsEmpty: false })
         {
-            Owner.DocumentManagerSubViewModel.ActiveDocument?.Operations.DeleteSelectedPixels(activeDocument
-                .AnimationDataViewModel.ActiveFrameBindable);
+            ActiveDocument.Operations.DeleteSelectedPixels(ActiveDocument.AnimationDataViewModel.ActiveFrameBindable);
         }
         else
         {
             var selectedMembers = ActiveDocument?.GetSelectedMembers();
-            Owner.DocumentManagerSubViewModel.ActiveDocument?.Operations.DeleteStructureMembers(selectedMembers);
+            if (selectedMembers == null || selectedMembers.Count == 0)
+                return;
+
+            ActiveDocument?.Operations.DeleteStructureMembers(selectedMembers);
         }
     }