From 411237e02ee50e417c0ee9214c658e2df62d5211 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Tue, 15 Nov 2016 19:22:15 -0500
Subject: [PATCH] bugfix for consistency check failure when undoing a deleted
[draw] command that has a scalar on the same canvas
---
pd/src/g_text.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pd/src/g_text.c b/pd/src/g_text.c
index 9b1ddd210..65af6bed5 100644
--- a/pd/src/g_text.c
+++ b/pd/src/g_text.c
@@ -1774,7 +1774,6 @@ static void text_vis(t_gobj *z, t_glist *glist, int vis)
{
//fprintf(stderr," draw it\n");
t_rtext *y = glist_findrtext(glist, x);
-
// make a group
text_getrect(&x->te_g, glist, &x1, &y1, &x2, &y2);
gui_vmess("gui_gobj_new", "xssiii",
@@ -2485,6 +2484,8 @@ static int compare_subpatch_selectors(t_atom *a, t_atom *b)
return 0;
}
+extern t_class *scalar_class;
+
void text_checkvalidwidth(t_glist *glist)
{
// readjust border in case the new object is invalid and it has more
@@ -2497,6 +2498,11 @@ void text_checkvalidwidth(t_glist *glist)
{
while (yg->g_next)
yg = yg->g_next;
+ /* bugfix for scalars. Since they don't have an rtext associated with
+ them the glist_findrtext call below will end with a failed
+ consistency check. This can happen when undoing on a canvas that
+ contains a scalar. */
+ if (pd_class((t_pd *)yg) == scalar_class) return;
t_text *newest_t = (t_text *)yg;
//fprintf(stderr, "newest object text class is %lx\n", newest_t);
t_rtext *yn = glist_findrtext(glist, newest_t);
--
GitLab