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

conf: Fix segfault when you remove one of any layouts in the conf file

Browse Source
This commit is contained in:
Martin Duquesnoy 2008-11-05 19:36:58 +01:00
parent 8f38ec390e
commit bc311b7ae6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/config.c
View File

@ -135,11 +135,11 @@ char_to_button(char *name)
}
Layout
layout_name_to_struct(Layout lt[], char *name)
layout_name_to_struct(Layout lt[], char *name, int n)
{
int i;
for(i = 0; i < NUM_OF_LAYOUT; ++i)
for(i = 0; i < n; ++i)
if(lt[i].func == name_to_func(name, layout_list))
return lt[i];
@ -469,6 +469,7 @@ init_conf(void)
}
}
/* tag */
/* if there is no tag in the conf or more than
* MAXTAG (32) print an error and create only one. */
@ -487,7 +488,7 @@ init_conf(void)
conf.tag[0].mwfact = 0.65;
conf.tag[0].nmaster = 1;
conf.tag[0].resizehint = False;
conf.tag[0].layout = layout_name_to_struct(conf.layout, "tile");
conf.tag[0].layout = layout_name_to_struct(conf.layout, "tile", conf.nlayout);
}
else
{
@ -500,7 +501,7 @@ init_conf(void)
conf.tag[i].mwfact = cfg_getfloat(cfgtmp, "mwfact");
conf.tag[i].nmaster = cfg_getint(cfgtmp, "nmaster");
conf.tag[i].resizehint = cfg_getbool(cfgtmp, "resizehint");
conf.tag[i].layout = layout_name_to_struct(conf.layout, cfg_getstr(cfgtmp, "layout"));
conf.tag[i].layout = layout_name_to_struct(conf.layout, cfg_getstr(cfgtmp, "layout"), conf.nlayout);
}
}

1
src/structs.h
View File

@ -39,7 +39,6 @@
#define MAXTAG 36
#define NUM_OF_LAYOUT 7
#define NUM_OF_TILE 5
/* Typedef */
typedef const char* uicb_t;