From: Emil Mikulic <emikulic@gmail.com>
Date: Sun, 21 Apr 2013 05:13:40 +0000 (+1000)
Subject: Skip over expanded keys.
X-Git-Tag: v1.2~6^2
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=d3621deb49713aad7c9758322b34316f4134a74f

Skip over expanded keys.

This fixes handling of filenames with % in them.
---

diff --git a/src/image-overlay.c b/src/image-overlay.c
index 10d8284b..dcba8ed1 100644
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -262,7 +262,7 @@ static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *v
 
 	new = g_string_new(str);
 
-	prev = 0;
+	prev = -1;
 
 	while (TRUE)
 		{
@@ -273,7 +273,7 @@ static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *v
 		gchar *extrapos = NULL;
 		gchar *p;
 
-		start = strchr(new->str, delim);
+		start = strchr(new->str + (prev + 1), delim);
 		if (!start)
 			break;
 		end = strchr(start+1, delim);