Fixed ADDADM parameter registering, fixed last parameter from user's parameter string always stayed

pull/170/head
parent a0913dbc39
commit 270e0e0fd0

@ -41,7 +41,6 @@ int yon_load_proceed(YON_CONFIG_TYPE type){
local_value=temp;
yon_config_set(key,yon_char_new(local_value));
yon_config_set_status(key,0);
}
}
@ -1023,10 +1022,21 @@ void on_expiration_clicked(GtkWidget *self, ubl_settings_usergroups_user_window
yon_config_remove_by_key(DEFAULTROOTPASSWD_parameter);
}
int user_k_admin = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DefaultUserAdministratorCheck));
if (user_k_admin){
yon_config_register(ADDADM_parameter,ADDADM_parameter_command,"yes");
if (!yon_config_check_ignore(ADDADM_parameter)){
if (user_k_admin){
yon_config_register(ADDADM_parameter,ADDADM_parameter_command,"yes");
} else {
yon_config_register(ADDADM_parameter,ADDADM_parameter_command,"no");
}
} else {
yon_config_register(ADDADM_parameter,ADDADM_parameter_command,"no");
char *user_k = config(ADDADM_parameter);
if (strcmp(user_k,user_k_admin?"yes":"no")){
if (user_k_admin){
yon_config_register(ADDADM_parameter,ADDADM_parameter_command,"yes");
} else {
yon_config_register(ADDADM_parameter,ADDADM_parameter_command,"no");
}
}
}
if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->PasswordHashCombo))!=0){
char *hash = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->PasswordHashCombo));
@ -2306,6 +2316,8 @@ void on_parameter_changed(GtkWidget *self,ubl_settings_usergroups_user_window *w
if (final_string[strlen(final_string)-1]==' ') final_string[strlen(final_string)-1]='\0';
gtk_entry_set_text(GTK_ENTRY(window->userExtraOptionsEntry),final_string);
free(final_string);
} else {
gtk_entry_set_text(GTK_ENTRY(window->userExtraOptionsEntry),"");
}
}

Loading…
Cancel
Save