Merge branch 'master' of git://github.com/derf/feh

2 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c2075b6..03a7ffe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ git HEAD
     * Treat quick, low-offset drags (1px or 2px move in <1 second) as clicks
       to improve graphics tablet support
       <https://github.com/derf/feh/issues/113>
+    * Respect --start-at in thumbnail mode
+      <https://github.com/derf/feh/issues/116>
 
 Tue, 16 Oct 2012 06:29:58 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
diff --git a/src/thumbnail.c b/src/thumbnail.c
index fbe2ce0..da14760 100644
--- a/src/thumbnail.c
+++ b/src/thumbnail.c
@@ -400,6 +400,16 @@ void init_thumbnail_mode(void)
 
 	if (!opt.display)
 		gib_imlib_free_image_and_decache(td.im_main);
+	else if (opt.start_list_at) {
+		for (l = thumbnails; l; l = l->next) {
+			if (!strcmp(opt.start_list_at, FEH_THUMB(l->data)->file->filename)) {
+				opt.start_list_at = NULL;
+				feh_thumbnail_select(winwid, FEH_THUMB(l->data));
+				break;
+			}
+		}
+	}
+
 
 	free(s);
 	return;