From fb0d3da5758ed7f5c5e02b09fa268915c2233bb8 Mon Sep 17 00:00:00 2001 From: Magnus Edenhill Date: Sat, 16 Feb 2008 20:41:18 +0000 Subject: [PATCH] - Set up default channel groups before referring to them. --- channels.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/channels.c b/channels.c index 1ad26b33..a5ef71dc 100644 --- a/channels.c +++ b/channels.c @@ -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 */