sam
/
nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed segfault when removing first image from file list, fixes issue #112

This commit is contained in:
Bert Münnich 2013-11-16 20:19:55 +01:00
parent 091aacb462
commit cc479ca5ac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION = git-20131114 VERSION = git-20131116
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man MANPREFIX = $(PREFIX)/share/man

4
main.c
View File

@ -296,7 +296,7 @@ void load_image(int new)
remove_file(new, false); remove_file(new, false);
if (new >= filecnt) if (new >= filecnt)
new = filecnt - 1; new = filecnt - 1;
else if (new < fileidx) else if (new > 0 && new < fileidx)
new--; new--;
} }
files[new].loaded = true; files[new].loaded = true;
@ -532,7 +532,7 @@ void run(void)
tns.cnt++; tns.cnt++;
} else { } else {
remove_file(tns.cnt, false); remove_file(tns.cnt, false);
if (tns.sel >= tns.cnt) if (tns.sel > 0 && tns.sel >= tns.cnt)
tns.sel--; tns.sel--;
} }
if (tns.cnt == filecnt) if (tns.cnt == filecnt)