From c8d02de3dbecb97228594afad7c77fcea7866bbc Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 3 Oct 2015 18:18:59 -0700 Subject: [PATCH] Allow coalescing undo over autosaves --- src/subs_controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/subs_controller.cpp b/src/subs_controller.cpp index 7d920333c..212d2dbad 100644 --- a/src/subs_controller.cpp +++ b/src/subs_controller.cpp @@ -313,7 +313,7 @@ void SubsController::OnCommit(AssFileCommit c) { commit_id = next_commit_id++; // Allow coalescing only if it's the last change and the file has not been // saved since the last change - if (commit_id == *c.commit_id+1 && redo_stack.empty() && saved_commit_id+1 != commit_id && autosaved_commit_id+1 != commit_id) { + if (commit_id == *c.commit_id+1 && redo_stack.empty() && saved_commit_id+1 != commit_id) { // If only one line changed just modify it instead of copying the file if (c.single_line && c.single_line->Group() == AssEntryGroup::DIALOGUE) { for (auto& diag : undo_stack.back().events) {