Skip to content
Extraits de code Groupes Projets
Valider c8d02de3 rédigé par Thomas Goyne's avatar Thomas Goyne
Parcourir les fichiers

Allow coalescing undo over autosaves

parent 52dbb482
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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) {
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter