GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-01 09:24:18 +00:00
Code Issues Releases Wiki Activity

config: conflict with v5_0 (develop) branch, opt_algorithm was changed from a pointer.

Browse Source
This commit is contained in:
Noel Maersk 2014-06-20 17:08:16 +03:00
parent 0b85c05c35
commit 6228694100
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config_parser.c
View File

@ -688,7 +688,7 @@ void load_default_profile()
//apply default settings //apply default settings
void apply_defaults() 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)) if(!empty_string(default_profile.devices))
set_devices((char *)default_profile.devices); set_devices((char *)default_profile.devices);
@ -1283,7 +1283,7 @@ void write_config(const char *filename)
else else
{ {
//save algorithm name //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"); applog(LOG_ERR, "Error: config_parser::write_config():\n json_object_set() failed on algorithm");
return; return;