Merge with develop

This commit is contained in:
kervala 2015-12-06 19:46:40 +01:00
parent e1d0fca6e0
commit 079ab7b757

View file

@ -350,12 +350,6 @@ bool CDriverGL::init (uintptr_t windowIcon, emptyProc exitFunc)
nlunreferenced(windowIcon); nlunreferenced(windowIcon);
// allow several threads to access X functions
if (XInitThreads() == 0)
{
nlwarning("XInitThreads failed");
}
_dpy = XOpenDisplay(NULL); _dpy = XOpenDisplay(NULL);
if (_dpy == NULL) if (_dpy == NULL)