Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 10:35:10 +00:00
Code Issues Releases Activity

Fix segfault when out_to_x = false. (#455)

Browse Source 
This resolves #454.
This commit is contained in:
Brenden Matthews 2018-01-23 13:52:11 -05:00 committed by GitHub
parent abd0be51a0
commit 562c737588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conky.cc
View File

@ -2076,20 +2076,24 @@ static void main_loop(void)
sigaddset(&newmask, SIGUSR1); sigaddset(&newmask, SIGUSR1);
#endif #endif
#ifdef BUILD_X11
#ifdef BUILD_XSHAPE #ifdef BUILD_XSHAPE
/* allow only decorated windows to be given mouse input */ if (out_to_x.get(*state)) {
int major_version, minor_version; /* allow only decorated windows to be given mouse input */
if (!XShapeQueryVersion(display, &major_version, &minor_version)) { int major_version, minor_version;
NORM_ERR("Input shapes are not supported"); if (!XShapeQueryVersion(display, &major_version, &minor_version)) {
} else { NORM_ERR("Input shapes are not supported");
if (own_window.get(*state) && } else {
(own_window_type.get(*state) != TYPE_NORMAL || if (own_window.get(*state) &&
(TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) { (own_window_type.get(*state) != TYPE_NORMAL ||
XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0, (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) {
NULL, 0, ShapeSet, Unsorted); XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0,
NULL, 0, ShapeSet, Unsorted);
}
} }
} }
#endif /* BUILD_XSHAPE */ #endif /* BUILD_XSHAPE */
#endif /* BUILD_X11 */
last_update_time = 0.0; last_update_time = 0.0;
next_update_time = get_time() - fmod(get_time(), active_update_interval()); next_update_time = get_time() - fmod(get_time(), active_update_interval());