Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-28 17:48:39 +00:00
Code Issues Releases Activity

set display to null for race condition

Browse Source 
https://github.com/dunst-project/dunst/blob/master/src/x11/x.c#L499
looks to be the source of some code which now sets display to NULL
for some type of race condition in X11. Xlibint.h allows for building
on Void Linux but needs min/max undefined. closes #1939
This commit is contained in:
zlice 2024-09-11 16:43:42 -04:00 committed by Brenden Matthews
parent bfa1d49142
commit 875c1af663
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/x11.cc
View File

@ -33,6 +33,9 @@
#include "x11.h"
#include <X11/X.h>
#include <X11/Xlibint.h>
#undef min
#undef max
#include <sys/types.h>
#include "common.h"
@ -314,6 +317,8 @@ void update_x11_resource_db(bool first_run) {
XrmDestroyDatabase(db);
}
// https://github.com/dunst-project/dunst/blob/master/src/x11/x.c#L499
display->db = NULL; // should be new or deleted
db = XrmGetStringDatabase((const char *)prop.value);
XrmSetDatabase(display, db);
}