Skip to content

Commit

Permalink
Fix loading of the ignore files stopping, if there is a duplicate name.
Browse files Browse the repository at this point in the history
When checking if the list was full (to stop further processing), the
loading code was using the is-duplicate return code from the
add...() function, rather then the list-is-full code.
  • Loading branch information
pjbroad committed Oct 8, 2024
1 parent d38703c commit d34fd7b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ignore.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ void load_ignores_list(char * file_name)
ch = ignore_list_mem[i];
if (ch == '\n' || ch == '\r')
{
if (j > 0 && add_to_ignore_list(name, 0) == -1)
// ignore list full
if (j > 0 && add_to_ignore_list(name, 0) == -2)
// cannot add more as list is full
break;
j = 0;
i++;
Expand Down
6 changes: 6 additions & 0 deletions main.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifdef LINUX
#include <X11/Xlib.h>
#endif
#ifdef OSX
#include <libgen.h>
#endif
Expand Down Expand Up @@ -558,6 +561,9 @@ int Main(int argc, char **argv)
int main(int argc, char **argv)
#endif
{
#ifdef LINUX
XInitThreads();
#endif
#ifdef ANDROID
initialize_gl4es();
#endif
Expand Down

0 comments on commit d34fd7b

Please sign in to comment.