Merge branch 'master' into sdl2.0

This commit is contained in:
Pere Pujal i Carabantes 2019-10-19 17:08:37 +02:00
commit be761daf7c
4 changed files with 45 additions and 36 deletions

View file

@ -19329,7 +19329,7 @@ static int do_new_dialog(void)
f2 = &(fs[k].f);
strcpy(fname2, f2->d_name);
if (strstr(fname, fname2) == fname2 && strcasestr(fname2, ".svg") != NULL)
if (strstr(fname2, fname) == fname2 && strlen(fname) == strlen(fname2)- strlen(".svg") && strcasestr(fname2, ".svg") != NULL)
{
/* SVG of this bitmap exists; we'll skip it */
skip = 1;