Roll back local fork when truncating history

When a soft reset or undo depth change happens, the history is supposed to be truncated at the point it's at currently, but it actually used the canvas state that included the local fork already, so it could end up with a desync in pathological cases. Now it rolls back the local fork before truncating the history and then applies it again afterwards.
drawpile · Sep 22, 2023 · f642e9f · f642e9f
1 parent adbae84
commit f642e9f
Show file tree

Hide file tree

Showing 4 changed files with 223 additions and 177 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -29,6 +29,7 @@ Unreleased Version 2.2.0-pre
  * Server Feature: Update the server to use the 2.2 protocol.
  * Server Fix: Fix up some invalid casts and thread ownership issues. Not sure if they actually caused issues in practice, but especially on Windows they might have.
  * Feature: Bring back the builtin server, allowing you to host "on this computer" again.
+ * Fix: Don't duplicate local fork on soft reset or undo depth change.
 
 2023-08-26 Version 2.2.0-beta.7
  * Fix: Make classic brushes not go brighter when smudging into transparency. Thanks to cada for reporting.