Unverified Commit ad6b72d3 authored by derf's avatar derf Committed by GitHub
Browse files

Merge pull request #442 from shlyakpavel/patch-1

There is no need to test ft against null
parents 5c0ab94b a4f09edc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 */