From 622869410062f605db8709a9e30623feec858798 Mon Sep 17 00:00:00 2001 From: Noel Maersk Date: Fri, 20 Jun 2014 17:08:16 +0300 Subject: [PATCH] config: conflict with v5_0 (develop) branch, opt_algorithm was changed from a pointer. --- config_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config_parser.c b/config_parser.c index fa8e380b..371d7a7a 100644 --- a/config_parser.c +++ b/config_parser.c @@ -688,7 +688,7 @@ void load_default_profile() //apply default settings void apply_defaults() { - set_algorithm(opt_algorithm, default_profile.algorithm.name); + set_algorithm(&opt_algorithm, default_profile.algorithm.name); if(!empty_string(default_profile.devices)) set_devices((char *)default_profile.devices); @@ -1283,7 +1283,7 @@ void write_config(const char *filename) else { //save algorithm name - if(json_object_set(config, "algorithm", json_string(opt_algorithm->name)) == -1) + if(json_object_set(config, "algorithm", json_string(opt_algorithm.name)) == -1) { applog(LOG_ERR, "Error: config_parser::write_config():\n json_object_set() failed on algorithm"); return;