- Set up default channel groups before referring to them.

This commit is contained in:
Magnus Edenhill 2008-02-16 20:41:18 +00:00
parent 6d49544849
commit fb0d3da575

View file

@ -258,7 +258,7 @@ channels_load(void)
{
struct config_head cl;
config_entry_t *ce;
char buf[400];
char buf[PATH_MAX];
DIR *dir;
struct dirent *d;
const char *name, *grp;
@ -282,6 +282,13 @@ channels_load(void)
}
config_free0(&cl);
tcg = channel_group_find("-disabled-", 1);
tcg->tcg_cant_delete_me = 1;
tcg->tcg_hidden = 1;
defgroup = channel_group_find("Uncategorized", 1);
defgroup->tcg_cant_delete_me = 1;
snprintf(buf, sizeof(buf), "%s/channels", settings_dir);
if((dir = opendir(buf)) == NULL)
@ -311,12 +318,6 @@ channels_load(void)
closedir(dir);
tcg = channel_group_find("-disabled-", 1);
tcg->tcg_cant_delete_me = 1;
tcg->tcg_hidden = 1;
defgroup = channel_group_find("Uncategorized", 1);
defgroup->tcg_cant_delete_me = 1;
/* Static services */