From 672087ce00603587b266da32f3bf74b9e44c6fe3 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Fri, 18 Sep 2015 00:20:35 -0400
Subject: [PATCH] Fix regression with [draw group]
---
pd/src/g_template.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/pd/src/g_template.c b/pd/src/g_template.c
index 035cfe4f3..aec7ed311 100644
--- a/pd/src/g_template.c
+++ b/pd/src/g_template.c
@@ -7625,11 +7625,14 @@ t_canvas *canvas_templatecanvas_forgroup(t_canvas *c)
t_binbuf *b = c->gl_obj.te_binbuf;
if (!b)
{
- return c;
- }
- t_atom *argv = binbuf_getvec(c->gl_obj.te_binbuf);
- if (argv[0].a_type == A_SYMBOL &&
- argv[0].a_w.w_symbol == gensym("group"))
+ return c;
+ }
+ t_atom *argv = binbuf_getvec(b);
+ if (binbuf_getnatom(b) > 1 &&
+ argv[0].a_type == A_SYMBOL &&
+ argv[0].a_w.w_symbol == gensym("draw") &&
+ argv[1].a_type == A_SYMBOL &&
+ argv[1].a_w.w_symbol == gensym("group"))
{
templatecanvas = canvas_templatecanvas_forgroup(c->gl_owner);
}
--
GitLab