Fix move tool undo crash

PixiEditor · Dec 18, 2021 · 40c444d · 40c444d
1 parent 12c0e3d
commit 40c444d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 32 deletions.
diff --git a/PixiEditor/Models/Tools/BitmapOperationTool.cs b/PixiEditor/Models/Tools/BitmapOperationTool.cs
@@ -1,11 +1,9 @@
-using System;
-using PixiEditor.Models.DataHolders;
+using PixiEditor.Models.DataHolders;
 using PixiEditor.Models.Layers;
 using PixiEditor.Models.Position;
 using PixiEditor.Models.Undo;
 using SkiaSharp;
 using System.Collections.Generic;
-using PixiEditor.Models.Tools.ToolSettings.Settings;
 
 namespace PixiEditor.Models.Tools
 {
@@ -47,7 +45,7 @@ public override void AfterUse(SKRectI sessionRect)
 
             var document = ViewModels.ViewModelMain.Current.BitmapManager.ActiveDocument;
             var args = new object[] { _change.Document };
-            document.UndoManager.AddUndoChange(_change.ToChange(UndoStorageBasedChange, args));
+            document.UndoManager.AddUndoChange(_change.ToChange(StorageBasedChange.BasicUndoProcess, args));
             _change = null;
         }
 
@@ -75,13 +73,5 @@ private void InitializeStorageBasedChange(SKRectI toolSessionRect)
 
             _change = new StorageBasedChange(doc, new[] { doc.ActiveLayer });
         }
-
-        private void UndoStorageBasedChange(Layer[] layers, UndoLayer[] data, object[] args)
-        {
-            Document document = (Document)args[0];
-            var ls = document.LayerStructure.CloneGroups();
-            StorageBasedChange.BasicUndoProcess(layers, data, args);
-            document.BuildLayerStructureProcess(new object[] { ls });
-        }
     }
 }
diff --git a/PixiEditor/Models/Tools/Tools/MoveTool.cs b/PixiEditor/Models/Tools/Tools/MoveTool.cs
@@ -183,7 +183,7 @@ private static void ApplySurfacesToLayers(Surface[] surfaces, Coordinates[] star
         private void SaveUndo(Document document)
         {
             var args = new object[] { change.Document };
-            document.UndoManager.AddUndoChange(change.ToChange(UndoProcess, args));
+            document.UndoManager.AddUndoChange(change.ToChange(StorageBasedChange.BasicUndoProcess, args));
             if (moveStartSelectedPoints != null)
             {
                 SelectionHelpers.AddSelectionUndoStep(document, moveStartSelectedPoints, SelectionType.New);
@@ -192,24 +192,5 @@ private void SaveUndo(Document document)
             }
             change = null;
         }
-
-        private void UndoProcess(Layer[] layers, UndoLayer[] data, object[] args)
-        {
-            if (args.Length > 0 && args[0] is Document document)
-            {
-                for (int i = 0; i < layers.Length; i++)
-                {
-                    Layer layer = layers[i];
-                    document.Layers.RemoveAt(data[i].LayerIndex);
-
-                    document.Layers.Insert(data[i].LayerIndex, layer);
-                    if (data[i].IsActive)
-                    {
-                        document.SetMainActiveLayer(data[i].LayerIndex);
-                    }
-                }
-
-            }
-        }
     }
 }
diff --git a/PixiEditor/Models/Undo/StorageBasedChange.cs b/PixiEditor/Models/Undo/StorageBasedChange.cs
@@ -273,6 +273,8 @@ public static void BasicUndoProcess(Layer[] layers, UndoLayer[] data, object[] a
         {
             if (args.Length > 0 && args[0] is Document document)
             {
+                var ls = document.LayerStructure.CloneGroups();
+
                 for (int i = 0; i < layers.Length; i++)
                 {
                     Layer layer = layers[i];
@@ -286,6 +288,7 @@ public static void BasicUndoProcess(Layer[] layers, UndoLayer[] data, object[] a
                     }
                 }
 
+                document.BuildLayerStructureProcess(new object[] { ls });
             }
         }
     }