Commit c6097dc6 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'aggraef/purr-data-backslash-fix'

parents cd9a53d4 8292ba16
......@@ -347,7 +347,7 @@ function gui_post_error(objectid, loglevel, errormsg) {
}
function gui_legacy_tcl_command(file, line_number, text) {
post("legacy tcl command at " + line_number + " of " + file);
post("legacy tcl command at " + line_number + " of " + file + ": " + text);
}
function clear_console() {
......
......@@ -756,7 +756,7 @@ static void escape_double_quotes(const char *src) {
while(*s)
{
len++;
if (*s == '\"')
if (*s == '\"' || *s == '\\')
{
dq++;
}
......@@ -771,10 +771,10 @@ static void escape_double_quotes(const char *src) {
s = src;
while(*s)
{
if (*s == '\"')
if (*s == '\"' || *s == '\\')
{
*tmp++ = '\\';
*tmp++ = '\"';
*tmp++ = *s;
}
else
{
......@@ -951,11 +951,8 @@ void sys_vguid(const char *file, int line, const char *fmt, ...)
strncat(bufp, "...", MAXPDSTRING);
}
}
/* For now, we're sending a dummy string instead of bufp to the GUI.
Unlike Pd messages, old tcl commands can contain stray backslashes
that can mess up the double quote delimiters for strings in gui_vmess.*/
gui_vmess("gui_legacy_tcl_command", "sis",
file, line, "dummy");
file, line, bufp);
//sys_vvguid(file,line,fmt,ap);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment