Skip to content

Commit

Permalink
Fix another missing separator bug in image overlay. This one was occu…
Browse files Browse the repository at this point in the history
…ring with default string when no ISO data was available from exif.
  • Loading branch information
Laurent Monin committed Aug 23, 2008
1 parent acc2c3b commit 4669108
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/image-overlay.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,22 +371,23 @@ static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *v
/* 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);
Expand Down

0 comments on commit 4669108

Please sign in to comment.