summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2017-02-16 23:10:20 +0100
committerDaniel Friesel <derf@finalrewind.org>2017-02-16 23:10:20 +0100
commitf27be5de2fde7e3a8be0d63e025c801ec7df5475 (patch)
treeb37de4a08ffeab5b30a1ded445ca478171430398
parent43cb0db3565837d8b4db3c343833ef753f6f2c0b (diff)
I made a derp2.18.2
-rw-r--r--ChangeLog6
-rw-r--r--src/winwidget.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d285a8..7c2ecfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu, 16 Feb 2017 23:05:39 +0100 Daniel Friesel <derf+feh@finalrewind.org>
+
+* Release v2.18.2
+ * Fix crash when using both --thumbnails and --title. This bug was
+ introduced in v2.18.1.
+
Sun, 22 Jan 2017 19:11:32 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* Release v2.18.1
diff --git a/src/winwidget.c b/src/winwidget.c
index e92f1c3..dae7bc9 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -634,7 +634,7 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias)
feh_draw_info(winwid);
if (winwid->errstr)
feh_draw_errstr(winwid);
- if (opt.title) {
+ if (opt.title && (current_file != NULL)) {
/* title might contain e.g. the zoom specifier -> rewrite */
char *s = slideshow_create_name(FEH_FILE(current_file->data), winwid);
winwidget_rename(winwid, s);