summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-09-28 12:34:58 +0200
committerDaniel Friesel <derf@finalrewind.org>2011-09-28 12:34:58 +0200
commit4807123ba77c4018a1fcfa31cee04001c07ba4c5 (patch)
tree2fb3c06d696be6be97aab7280161ddfa8f17c760
parent5e60401434b64cb6a890d26dbc924043a47c90aa (diff)
feh_draw_info: Do not fail if the info_cmd did not output anything
-rw-r--r--ChangeLog1
-rw-r--r--src/imlib.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cf4027d..f722a04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
git HEAD
* The --bg-options now accept multiple filenames, one per Xinerama screen
+ * Fix --info bug when the command wrote no lines to stdout
Mon, 26 Sep 2011 09:35:41 +0200 Daniel Friesel <derf@finalrewind.org>
diff --git a/src/imlib.c b/src/imlib.c
index 28ae018..fc7fb16 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -543,6 +543,9 @@ void feh_draw_info(winwidget w)
pclose(info_pipe);
}
+ if (no_lines == 0)
+ return;
+
height *= no_lines;
width += 4;