nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-04-14 22:54:36 +02:00
parent 70d28bc7af 412b15b6b8
commit 8247f44e95
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i3bar/src/xcb.c
View File

@ -541,7 +541,9 @@ static void handle_client_message(xcb_client_message_event_t* event) {
} }
/* In case of tray_output == primary and there is no primary output /* In case of tray_output == primary and there is no primary output
* configured, we fall back to the first available output. */ * configured, we fall back to the first available output. */
if (output == NULL && strcasecmp("primary", config.tray_output) == 0) { if (output == NULL &&
config.tray_output &&
strcasecmp("primary", config.tray_output) == 0) {
SLIST_FOREACH(walk, outputs, slist) { SLIST_FOREACH(walk, outputs, slist) {
if (!walk->active) if (!walk->active)
continue; continue;