summaryrefslogtreecommitdiff
path: root/gst/gstpreset.c
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sf.net>2009-05-24 23:14:26 +0300
committerStefan Kost <ensonic@users.sf.net>2009-05-24 23:14:26 +0300
commit9574d82bf9c9172939e96f493ab3d7d12fd046da (patch)
treef0a6bdb56a7d20a7f4e8be1c2a1c4b289ba1d5dd /gst/gstpreset.c
parent5c4751c601ecf08bb09d495e1f8c23c51b256219 (diff)
preset: fix update rule
Only update the preset from system, if we had a preset before and system version is newer.
Diffstat (limited to 'gst/gstpreset.c')
-rw-r--r--gst/gstpreset.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/gst/gstpreset.c b/gst/gstpreset.c
index db4f0fe13..f376aace8 100644
--- a/gst/gstpreset.c
+++ b/gst/gstpreset.c
@@ -344,10 +344,12 @@ preset_get_keyfile (GstPreset * preset)
/* compare version to check for merge */
if (in_system) {
- if (!in_user || preset_parse_version (str_version_system) >
+ /* keep system presets if there is no user preset or when the system
+ * version is higher than the user version. */
+ if (!in_user) {
+ presets = in_system;
+ } else if (preset_parse_version (str_version_system) >
preset_parse_version (str_version_user)) {
- /* keep system presets if there is no user preset or when the system
- * version is higher than the user version. */
presets = in_system;
updated_from_system = TRUE;
}