From 412316900b62656d7e25ce07cb4a7af3f2bce26e Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Fri, 23 Dec 2011 17:49:48 +0100
Subject: get_index_string_dim: return 0,0 when index_info is empty (closes
 #76)

---
 ChangeLog   | 2 ++
 src/index.c | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7b9a374..1301642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ git HEAD
     * Pause slideshow when editing captions
     * Makefile: Respect CPPFLAGS when creating deps.mk
       <https://github.com/derf/feh/issues/74>
+    * Fix --montage mode
+      <https://github.com/derf/feh/issues/76>
 
 Wed, 02 Nov 2011 10:56:10 +0100  Daniel Friesel <derf@finalrewind.org>
 
diff --git a/src/index.c b/src/index.c
index 2bb5787..b489c55 100644
--- a/src/index.c
+++ b/src/index.c
@@ -425,8 +425,11 @@ void get_index_string_dim(feh_file *file, Imlib_Font fn, int *fw, int *fh)
 	gib_list *line, *lines;
 	int max_w = 0, total_h = 0;
 
-	if (!opt.index_info)
+	if (!opt.index_info) {
+		*fw = 0;
+		*fh = 0;
 		return;
+	}
 
 	/* called with file = NULL in the setup phase.
 	 * We need a fake file, otherwise feh_printf will remove format specifiers,
-- 
cgit v1.2.3