nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

systray: Do not turn off compositing for missing window errors

Browse source
This commit is contained in:
o9000 2015-06-13 11:32:22 +02:00
parent f28983e5a7
commit cae621918e
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/systray/systraybar.c
View file

@ -746,7 +746,7 @@ void systray_render_icon_composited(void* t)
// drawable. If someone knows why it does not work with the traywindow itself, please tell me ;) // drawable. If someone knows why it does not work with the traywindow itself, please tell me ;)
Pixmap tmp_pmap = XCreatePixmap(server.dsp, traywin->win, traywin->width, traywin->height, 32); Pixmap tmp_pmap = XCreatePixmap(server.dsp, traywin->win, traywin->width, traywin->height, 32);
if (!tmp_pmap) { if (!tmp_pmap) {
goto on_error; goto on_systray_error;
} }
XRenderPictFormat *f; XRenderPictFormat *f;
if (traywin->depth == 24) { if (traywin->depth == 24) {
@ -761,7 +761,7 @@ void systray_render_icon_composited(void* t)
XRenderPictFormat *f32 = XRenderFindVisualFormat(server.dsp, server.visual32); XRenderPictFormat *f32 = XRenderFindVisualFormat(server.dsp, server.visual32);
if (!f || !f32) { if (!f || !f32) {
XFreePixmap(server.dsp, tmp_pmap); XFreePixmap(server.dsp, tmp_pmap);
goto on_error; goto on_systray_error;
} }
XSync(server.dsp, False); XSync(server.dsp, False);
@ -833,7 +833,11 @@ void systray_render_icon_composited(void* t)
return; return;
on_error: on_error:
printf("systray: rendering error. Disabling compositing and restarting systray...\n"); printf("systray %d: rendering error for icon %lu pid %d\n", __LINE__, traywin->win, traywin->pid);
return;
on_systray_error:
printf("systray %d: rendering error for icon %lu pid %d. Disabling compositing and restarting systray...\n", __LINE__, traywin->win, traywin->pid);
systray_composited = 0; systray_composited = 0;
stop_net(); stop_net();
start_net(); start_net();