Fixed groups exception

PixiEditor · Dec 12, 2021 · 34318c0 · 34318c0
1 parent 70d0b28
commit 34318c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/PixiEditor/Models/DataHolders/WpfObservableRangeCollection.cs b/PixiEditor/Models/DataHolders/WpfObservableRangeCollection.cs
@@ -11,6 +11,7 @@ namespace PixiEditor.Models.DataHolders
 {
 public class WpfObservableRangeCollection<T> : RangeObservableCollection<T>
 {
+        public bool SuppressNotify { get; set; } = false;
   DeferredEventsCollection _deferredEvents;
 
   public WpfObservableRangeCollection()
@@ -37,6 +38,7 @@ public WpfObservableRangeCollection(List<T> list) : base(list)
   /// </remarks>
   protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
   {
+            if (SuppressNotify) return;
     var _deferredEvents = (ICollection<NotifyCollectionChangedEventArgs>) typeof(RangeObservableCollection<T>)
       .GetField("_deferredEvents", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(this);
     if (_deferredEvents != null)

diff --git a/PixiEditor/Models/Undo/StorageBasedChange.cs b/PixiEditor/Models/Undo/StorageBasedChange.cs
@@ -260,9 +260,13 @@ public static void BasicUndoProcess(Layer[] layers, UndoLayer[] data, object[] a
                 for (int i = 0; i < layers.Length; i++)
                 {
                     Layer layer = layers[i];
+                    document.Layers.SuppressNotify = true;
                     document.Layers.RemoveAt(data[i].LayerIndex);
+                    document.Layers.SuppressNotify = false;
 
                     document.Layers.Insert(data[i].LayerIndex, layer);
+
+
                     if (data[i].IsActive)
                     {
                         document.SetMainActiveLayer(data[i].LayerIndex);

diff --git a/PixiEditor/ViewModels/SubViewModels/Main/LayersViewModel.cs b/PixiEditor/ViewModels/SubViewModels/Main/LayersViewModel.cs
@@ -180,7 +180,6 @@ public void NewLayer(object parameter)
                 doc.MoveLayerInStructure(doc.Layers[^1].LayerGuid, lastActiveLayerGuid, true);
                 Guid? parent = parameter is Layer or LayerStructureItemContainer ? activeLayerParent?.GroupGuid : activeLayerParent.Parent?.GroupGuid;
                 doc.LayerStructure.AssignParent(doc.ActiveLayerGuid, parent);
-                doc.UndoManager.UndoStack.Pop();
             }
             if (control != null)
             {