From 3f04935d969ad15a5368d088e962d0efdd2c7b65 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Sun, 2 Sep 2012 19:28:40 +0100 Subject: [PATCH] If dvrallcfg does not exist, use the setting for dvr. This is to ensure less confusion on migration from 2.12 to 3.0+. Fixes #1192. --- src/access.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/access.c b/src/access.c index ee7c467c..b8c73f90 100644 --- a/src/access.c +++ b/src/access.c @@ -483,6 +483,11 @@ access_record_update(void *opaque, const char *id, htsmsg_t *values, if(!htsmsg_get_u32(values, "dvrallcfg", &u32)) access_update_flag(ae, ACCESS_RECORDER_ALL, u32); + // Note: dvrallcfg was added post 2.12, to ensure less confusing + // migration if this doesn't exist use standard dvr config value + else + access_update_flag(ae, ACCESS_RECORDER_ALL, + (ae->ae_rights & ACCESS_RECORDER)); if(!htsmsg_get_u32(values, "admin", &u32)) access_update_flag(ae, ACCESS_ADMIN, u32);