From 3a33f26356b47bd26682b2218f256d42c7ab4a69 Mon Sep 17 00:00:00 2001
From: kriastans <kriastans@protonmail.com>
Date: Sat, 3 Aug 2024 21:48:10 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=9D=BF=E6=93=A6=E5=AF=BC=E8=87=B4=E7=9A=84TimeMachi?=
 =?UTF-8?q?ne=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4=E5=A2=A8=E8=BF=B9?=
 =?UTF-8?q?=E8=A2=AB=E6=93=A6=E9=99=A4=E4=BA=8B=E4=BB=B6=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 InkCanvasForClass/MainWindow_cs/MW_Eraser.cs       | 8 ++++++++
 InkCanvasForClass/MainWindow_cs/MW_ShapeDrawing.cs | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/InkCanvasForClass/MainWindow_cs/MW_Eraser.cs b/InkCanvasForClass/MainWindow_cs/MW_Eraser.cs
index 15babaf..3ffca75 100644
--- a/InkCanvasForClass/MainWindow_cs/MW_Eraser.cs
+++ b/InkCanvasForClass/MainWindow_cs/MW_Eraser.cs
@@ -94,6 +94,14 @@ namespace Ink_Canvas {
 
             // end hittest
             hitTester.EndHitTesting();
+
+            // commit stroke erased history
+            // 我有受虐倾向，被这个bug硬控10秒钟，请大家嘲笑我
+            if (ReplacedStroke != null || AddedStroke != null) {
+                timeMachine.CommitStrokeEraseHistory(ReplacedStroke, AddedStroke);
+                AddedStroke = null;
+                ReplacedStroke = null;
+            }
         }
 
         private void EraserGeometry_StrokeHit(object sender,
diff --git a/InkCanvasForClass/MainWindow_cs/MW_ShapeDrawing.cs b/InkCanvasForClass/MainWindow_cs/MW_ShapeDrawing.cs
index 3a284f7..b5adaa8 100644
--- a/InkCanvasForClass/MainWindow_cs/MW_ShapeDrawing.cs
+++ b/InkCanvasForClass/MainWindow_cs/MW_ShapeDrawing.cs
@@ -1558,11 +1558,6 @@ namespace Ink_Canvas {
             }
 
             isMouseDown = false;
-            if (ReplacedStroke != null || AddedStroke != null) {
-                timeMachine.CommitStrokeEraseHistory(ReplacedStroke, AddedStroke);
-                AddedStroke = null;
-                ReplacedStroke = null;
-            }
 
             if (_currentCommitType == CommitReason.ShapeDrawing && drawingShapeMode != 9) {
                 _currentCommitType = CommitReason.UserInput;