version 1.4.42b

[polyglot.git] / xboard2uci.c

diff --git a/xboard2uci.c b/xboard2uci.c
index 6dda5cf..d3d91c5 100644 (file)
--- a/xboard2uci.c
+++ b/xboard2uci.c
@@ -770,10 +770,12 @@ void format_xboard_option_line(char * option_line, option_t *opt){
     strcat(option_line,option_string);\r
     if(strcmp(opt->type,"button") && strcmp(opt->type,"combo")){\r
         if(strcmp(opt->type,"check")){\r
-            sprintf(option_string," %s",opt->default_);\r
+            sprintf(option_string," %s",opt->value);\r
         }else{\r
             sprintf(option_string," %d",\r
-                    my_string_case_equal(opt->default_,"true")?1:0);\r
+                    my_string_case_equal(opt->value,"true")||\r
+                    my_string_equal(opt->value,"1")\r
+                    ?1:0);\r
         }\r
         strcat(option_line,option_string);\r
     }\r
@@ -786,7 +788,7 @@ void format_xboard_option_line(char * option_line, option_t *opt){
         strcat(option_line,option_string);\r
     }\r
     for(j=0;j<opt->var_nb;j++){\r
-        if(!strcmp(opt->var[j],opt->default_)){\r
+        if(!strcmp(opt->var[j],opt->value)){\r
             sprintf(option_string," *%s",opt->var[j]);\r
         }else{\r
             sprintf(option_string," %s",opt->var[j]);\r
@@ -870,7 +872,6 @@ static void send_xboard_options(){
         if(my_string_case_equal(opt->name,"NalimovPath")) continue;\r
         if((name=uci_thread_option(Uci))!=NULL &&\r
            my_string_case_equal(opt->name,name)) continue;\r
-        \r
         format_xboard_option_line(option_line,opt);\r
         \r
         gui_send(GUI,"%s",option_line);\r
@@ -880,6 +881,11 @@ static void send_xboard_options(){
     option_start_iter(Option);\r
     while((opt=option_next(Option))){\r
         if(opt->mode &XBOARD){\r
+            if(my_string_case_equal(opt->name,"Persist") &&\r
+               my_string_case_equal(option_get_default(Option,opt->name),\r
+                                    "false")){\r
+                continue;\r
+            }\r
             format_xboard_option_line(option_line,opt);\r
             gui_send(GUI,"%s",option_line);\r
         }\r