From 8903712a1ed9018f6226b3750a9a77baf30fdb71 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 24 Sep 2009 20:30:54 +0200 Subject: [PATCH] load_patterns(): Do not overwrite the default patterns array --- playout/moggy.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/playout/moggy.c b/playout/moggy.c index e4fd79f..ff4d8de 100644 --- a/playout/moggy.c +++ b/playout/moggy.c @@ -257,10 +257,15 @@ error: static void init_patterns(struct playout_policy *p) { - /* Replaces default patterns if the file is found, no-op otherwise. */ - load_patterns(moggy_patterns_src, moggy_patterns_src_n, "moggy.patterns"); + char src[moggy_patterns_src_n][11]; - pattern_genall(p, moggy_patterns_src, moggy_patterns_src_n); + if (!load_patterns(src, moggy_patterns_src_n, "moggy.patterns")) { + /* Use default pattern set. */ + for (int i = 0; i < moggy_patterns_src_n; i++) + strcpy(src[i], moggy_patterns_src[i]); + } + + pattern_genall(p, src, moggy_patterns_src_n); } -- 2.11.4.GIT