Commit c67d885b authored by Chong Yidong's avatar Chong Yidong

* nsterm.m (ns_defined_color): Block input. Suggested by Mike

<deactivated@gmail.com> (Bug#3605).
parent 8fab2362
2010-01-31 Chong Yidong <cyd@stupidchicken.com>
* nsterm.m (ns_defined_color): Block input. Suggested by Mike
<deactivated@gmail.com> (Bug#3605).
2010-01-31 David De La Harpe Golden <david@harpegolden.net>
* fileio.c (Frename_file): Correctly rename symlinks to
......
......@@ -1552,19 +1552,19 @@ Free a pool and temporary objects it refers to (callable from C)
Return 0 if not found
-------------------------------------------------------------------------- */
{
NSColor *temp;
int notFound = ns_get_color (name, &temp);
NSColor *col;
NSTRACE (ns_defined_color);
if (notFound)
return 0;
BLOCK_INPUT;
if (ns_get_color (name, &col) != 0) /* Color not found */
{
UNBLOCK_INPUT;
return 0;
}
if (makeIndex && alloc)
color_def->pixel = ns_index_color(temp, f); /* [temp retain]; */
ns_query_color (temp, color_def, !makeIndex);
color_def->pixel = ns_index_color (col, f);
ns_query_color (col, color_def, !makeIndex);
UNBLOCK_INPUT;
return 1;
}
......
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