summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@chaosdorf.de>2018-12-26 08:59:37 +0100
committerGitHub <noreply@github.com>2018-12-26 08:59:37 +0100
commitad6b72d38f08705c6fe8c3c5530b7f40713743e0 (patch)
treee42b0b4b4dfb991e874230b413012365e8f3c5e7 /src
parent5c0ab94b0cd1b944127448f4228690f122b702ef (diff)
parenta4f09edc1eb8a673cb1d953aeded7ac0b1295859 (diff)
Merge pull request #442 from shlyakpavel/patch-1
There is no need to test ft against null
Diffstat (limited to 'src')
-rw-r--r--src/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index ded0b22..87cf7c4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -183,7 +183,7 @@ int feh_main_iteration(int block)
&& ((errno == ENOMEM) || (errno == EINVAL)
|| (errno == EBADF)))
eprintf("Connection to X display lost");
- if ((ft) && (count == 0)) {
+ if (count == 0) {
/* This means the timer is due to be executed. If count was > 0,
that would mean an X event had woken us, we're not interested
in that */