# HG changeset patch # User Laurent Monin # Date 1219525645 0 # Node ID bf55a17048580a8437eddd0da209d5c1fb851da7 # Parent f35ec0ea2eddb52b949818debf29d0fa3ccb559b Fix another missing separator bug in image overlay. This one was occuring with default string when no ISO data was available from exif. diff -r f35ec0ea2edd -r bf55a1704858 src/image-overlay.c --- a/src/image-overlay.c Sat Aug 23 20:46:31 2008 +0000 +++ b/src/image-overlay.c Sat Aug 23 21:07:25 2008 +0000 @@ -371,22 +371,23 @@ /* insert separator */ g_string_insert(new, pos, sep); pos += strlen(sep); + want_separator = FALSE; } g_string_insert(new, pos, data); pos += strlen(data); } - want_separator = FALSE; - if (pos-prev >= 1 && new->str[pos] == imp) { /* pipe character is replaced by a separator, delete it * and raise a flag if needed */ g_string_erase(new, pos--, 1); - want_separator = (data && *data); + want_separator |= (data && *data); } - + + if (new->str[pos] == '\n') want_separator = FALSE; + prev = pos - 1; g_free(name);