M src/systray/systraybar.c → src/systray/systraybar.c

@@ -522,9 +522,13 @@ // drawable. If someone knows why it does not work with the traywindow itself, please tell me ;)
 	Pixmap tmp_pmap = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, server.depth);
 	XRenderPictFormat* f;
 	if (traywin->depth == 24)
-		f = XRenderFindVisualFormat(server.dsp, DefaultVisual(server.dsp, 0));
-	else
+		f = XRenderFindStandardFormat(server.dsp, PictStandardRGB24);
+	else if (traywin->depth == 32)
 		f = XRenderFindStandardFormat(server.dsp, PictStandardARGB32);
+	else {
+		printf("Strange tray icon found...\n");
+		return;
+	}
 	Picture pict_image = XRenderCreatePicture(server.dsp, traywin->tray_id, f, 0, 0);
 	Picture pict_drawable = XRenderCreatePicture(server.dsp, tmp_pmap, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
 	XRenderComposite(server.dsp, PictOpSrc, pict_image, None, pict_drawable, 0, 0, 0, 0, 0, 0, traywin->width, traywin->height);

M src/tint.c → src/tint.c

@@ -694,7 +694,7 @@ }
 			XFlush (server.dsp);
 
 			panel = (Panel*)systray.area.panel;
-			if (refresh_systray && !panel->is_hidden) {
+			if (refresh_systray && panel && !panel->is_hidden) {
 				refresh_systray = 0;
 				// tint2 doen't draw systray icons. it just redraw background.
 				XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap);