godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conf: Fix segfault when layout system is switch.

Browse Source
This commit is contained in:
Martin Duquesnoy 2009-09-05 11:01:37 +02:00
parent 36cc0c1f88
commit 543320486c
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/config.c
View File

@ -297,25 +297,25 @@ conf_layout_section(char *src)
conf.colors.layout_fg,
conf.colors.bar,
conf.colors.text);
}
if(!conf.layout[0].symbol
&& !conf.layout[0].func)
if(!conf.layout[0].symbol
&& !conf.layout[0].func)
{
for(i = 0; i < conf.nlayout; ++i)
{
for(i = 0; i < conf.nlayout; ++i)
tmp = get_nsec(src, "layout", i);
if(!name_to_func((p = get_opt(tmp, "tile", "type").str), layout_list))
fprintf(stderr, "WMFS Configuration: Unknow Layout type: \"%s\"\n", p);
else
{
tmp = get_nsec(src, "layout", i);
if(conf.layout_system && conf.nlayout > 1)
menu_new_item(&menulayout.item[i], get_opt(tmp, "", "symbol").str,
uicb_set_layout, p);
if(!name_to_func((p = get_opt(tmp, "tile", "type").str), layout_list))
fprintf(stderr, "WMFS Configuration: Unknow Layout type: \"%s\"\n", p);
else
{
if(conf.layout_system && conf.nlayout > 1)
menu_new_item(&menulayout.item[i], get_opt(tmp, "", "symbol").str,
uicb_set_layout, p);
conf.layout[i].symbol = get_opt(tmp, "TILE (default)", "symbol").str;
conf.layout[i].func = name_to_func(p, layout_list);
}
conf.layout[i].symbol = get_opt(tmp, "TILE (default)", "symbol").str;
conf.layout[i].func = name_to_func(p, layout_list);
}
}
}

4
src/ewmh.c
View File

@ -167,8 +167,8 @@ ewmh_update_current_tag_prop(void)
/* Current layout */
XChangeProperty(dpy, ROOT, net_atom[wmfs_current_layout], net_atom[utf8_string], 8,
PropModeReplace, (uchar*)tags[selscreen][seltag[selscreen]].layout.symbol,
strlen(tags[selscreen][seltag[selscreen]].layout.symbol));
PropModeReplace, (uchar*)tags[selscreen][seltag[selscreen]].layout.symbol,
strlen(tags[selscreen][seltag[selscreen]].layout.symbol));
free(s);