aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--main.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 4e3390a..f14f65c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = git-20171024
+VERSION = git-20171026
srcdir = .
VPATH = $(srcdir)
diff --git a/main.c b/main.c
index 8eea930..ebe14c9 100644
--- a/main.c
+++ b/main.c
@@ -159,8 +159,8 @@ void remove_file(int n, bool manual)
memmove(files + n, files + n + 1, (filecnt - n - 1) * sizeof(*files));
}
filecnt--;
- if (fileidx >= filecnt)
- fileidx = filecnt - 1;
+ if (n < fileidx)
+ fileidx--;
if (n < alternate)
alternate--;
}
@@ -290,6 +290,7 @@ end:
void load_image(int new)
{
+ bool prev = new < fileidx;
static int current;
if (new < 0 || new >= filecnt)
@@ -307,7 +308,7 @@ void load_image(int new)
remove_file(new, false);
if (new >= filecnt)
new = filecnt - 1;
- else if (new > 0 && new < fileidx)
+ else if (new > 0 && prev)
new--;
}
files[new].flags &= ~FF_WARN;