set display to null for race condition #2032
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 brndnmtthws#1939
✅ Deploy Preview for conkyweb canceled.
|
github-actions
bot
added
sources
Caellian
approved these changes
Sep 13, 2024
Comment on lines
+36
to
+38
| #include <X11/Xlibint.h> | ||
| #undef min | ||
| #undef max |
There was a problem hiding this comment.
Required on Void Linux - Author stated in related issue (#1939) the code doesn't compile without this include.
Comment on lines
+320
to
+321
| // https://github.com/dunst-project/dunst/blob/master/src/x11/x.c#L499 | ||
| display->db = NULL; // should be new or deleted |
There was a problem hiding this comment.
Dunst does this so it looks ok to me.
brndnmtthws
approved these changes
Sep 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
doc/has been updatedDescription
Per #1939 there is some kind of race condition when starting X11 after conky 1.21 where it will not show up on desktop or in
ps aux.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
Without Xlibint.h it errors out, though Caellian didn't need it to build I think.