zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change(core/linux/x11): call to XInitThreads must be first libx11 call

Browse source
This commit is contained in:
Ronald M Zielaznicki 2024-10-21 12:09:51 -04:00 • committed by Stephen Gutekanst
parent 15a2cb1f0c
commit 90b0923fa5
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/linux/X11.zig
View file

@ -86,6 +86,7 @@ pub fn init(
) !X11 { ) !X11 {
// TODO(core): return errors.NotSupported if not supported // TODO(core): return errors.NotSupported if not supported
const libx11 = try LibX11.load(); const libx11 = try LibX11.load();
_ = libx11.XInitThreads();
const libgl: ?LibGL = LibGL.load() catch |err| switch (err) { const libgl: ?LibGL = LibGL.load() catch |err| switch (err) {
error.LibraryNotFound => null, error.LibraryNotFound => null,
else => return err, else => return err,
@ -185,7 +186,6 @@ pub fn init(
.libxkbcommon = try LibXkbCommon.load(), .libxkbcommon = try LibXkbCommon.load(),
}; };
_ = libx11.XSetErrorHandler(errorHandler); _ = libx11.XSetErrorHandler(errorHandler);
_ = libx11.XInitThreads();
_ = libx11.XrmInitialize(); _ = libx11.XrmInitialize();
defer _ = libx11.XFreeColormap(display, colormap); defer _ = libx11.XFreeColormap(display, colormap);
for (0..2) |i| { for (0..2) |i| {