From f325d8c8dbf1e45d76e90000a4b02cf9213aec8d Mon Sep 17 00:00:00 2001
From: Guillem <guillembartrina@gmail.com>
Date: Sat, 20 Jun 2020 15:55:53 +0200
Subject: [PATCH] delete empty sequence if found
---
pd/src/g_undo.c | 13 ++++++++++++-
pd/src/g_undo.h | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/pd/src/g_undo.c b/pd/src/g_undo.c
index 450f9dc10..e7bb99912 100644
--- a/pd/src/g_undo.c
+++ b/pd/src/g_undo.c
@@ -50,7 +50,18 @@ t_undo_action *canvas_undo_add(t_canvas *x, int type, const char *name,
{
//fprintf(stderr,"canvas_undo_add %d\n", type);
- /* Check for empty sequences? */
+ if(UNDO_SEQUENCE_END == type
+ && x && x->u_last
+ && UNDO_SEQUENCE_START == x->u_last->type)
+ {
+ /* empty undo sequence...get rid of it */
+ x->u_last = x->u_last->prev;
+ canvas_undo_rebranch(x);
+ x->u_last->next = 0;
+ canvas_undo_name = x->u_last->name;
+ gui_vmess("gui_undo_menu", "xss", x, x->u_last->name, "no");
+ return 0;
+ }
t_undo_action *a = canvas_undo_init(x);
a->type = type;
diff --git a/pd/src/g_undo.h b/pd/src/g_undo.h
index 8abdd1943..05e4323c4 100644
--- a/pd/src/g_undo.h
+++ b/pd/src/g_undo.h
@@ -62,7 +62,7 @@ typedef enum
struct _undo_action
{
t_canvas *x; /* canvas undo is associated with */
- t_undo_type type; /* defines what kind of data container it is */
+ t_undo_type type; /* defines what kind of data container it is */
void *data; /* each action will have a different data container */
char *name; /* name of current action */
struct _undo_action *prev; /* previous undo action */
--
GitLab