diff --git a/ignore.c b/ignore.c
index bc1de2374..fa7bbf472 100644
--- a/ignore.c
+++ b/ignore.c
@@ -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++;
diff --git a/main.c b/main.c
index 3647581d1..574100bda 100644
--- a/main.c
+++ b/main.c
@@ -1,3 +1,6 @@
+#ifdef LINUX
+#include <X11/Xlib.h>
+#endif
 #ifdef OSX
 #include <libgen.h>
 #endif
@@ -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