diff options
author | godspeed1989 <tongxinjichu@gmail.com> | 2015-09-03 21:58:30 +0800 |
---|---|---|
committer | godspeed1989 <tongxinjichu@gmail.com> | 2015-09-03 21:58:30 +0800 |
commit | f5cf1981025962ac36cf6cb96456a88b29d72076 (patch) | |
tree | 46b9895df84cfc217a078ce5f8db8361f4128ad5 | |
parent | a966eab797855744f70101ed6f36a62e99b51c9d (diff) | |
parent | 9bfd37672dc4d58add09931ea0c9139098478070 (diff) | |
download | fbv-f5cf1981025962ac36cf6cb96456a88b29d72076.tar.gz fbv-f5cf1981025962ac36cf6cb96456a88b29d72076.zip |
Merge pull request #2 from maherma-adg/master
fix ret code on slideshow mode.
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | main.c | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a5a6db7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.o +config.* +fbv @@ -28,6 +28,7 @@ distclean: clean install: $(OUT) cp $(OUT) $(bindir) + [ -d $(mandir)/man1 ] || mkdir -p $(mandir)/man1 gzip -9c $(OUT).1 > $(mandir)/man1/$(OUT).1.gz uninstall: $(bindir)/$(OUT) @@ -308,7 +308,10 @@ identified: FD_SET(0, &fds); if(select(1, &fds, NULL, NULL, &tv) <= 0) + { + ret = 1; break; + } delay = 0; } |