Merge pull request 'Fixed crash' (#183) from YanTheKaller/ubl-settings-datetime:master into master

Reviewed-on: #183
pull/189/head v2.22
Dmitry Razumov 6 months ago
commit 8871d9e53f

@ -446,6 +446,7 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){
}
break;
case 2:{
if (!getuid()){
int size;
config_str parsed = yon_config_load(get_ntp_default_command,&size);
if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){
@ -457,8 +458,10 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){
gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),"");
}
}
}
break;
case 3:{
if (!getuid()){
int size;
config_str parsed = yon_config_load(get_ntp_ru_command,&size);
if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){
@ -470,6 +473,7 @@ void on_ntp_sync(GtkWidget *, main_window *widgets){
gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),"");
}
}
}
break;
case 1:
gtk_entry_set_placeholder_text(GTK_ENTRY(widgets->NTPEntry),"DHCP");
@ -537,15 +541,17 @@ void config_init(){
main_config.ntp_default = NULL;
char *ntp_command = yon_config_parameter_prepare_command(NTPSERVERS_parameter_raw_command,"default",NULL,NULL);
int size;
config_str parsed = yon_config_load(ntp_command,&size);
if (size>0){
if (strcmp(parsed[0],"(null)\n")){
yon_char_remove_last_symbol(parsed[0],'\n');
if (strstr(parsed[0],"[")&&strstr(parsed[0],"]"))
main_config.ntp_default = strstr(parsed[0],"] ")+2;
else
main_config.ntp_default = parsed[0];
if (!getuid()){
int size;
config_str parsed = yon_config_load(ntp_command,&size);
if (size>0){
if (strcmp(parsed[0],"(null)\n")){
yon_char_remove_last_symbol(parsed[0],'\n');
if (strstr(parsed[0],"[")&&strstr(parsed[0],"]"))
main_config.ntp_default = strstr(parsed[0],"] ")+2;
else
main_config.ntp_default = parsed[0];
}
}
}
}
@ -631,7 +637,7 @@ void yon_main_window_complete(main_window **window){
}
}
}
{
if (!getuid()){
int size;
config_str parsed = yon_config_load(HWCLOCK_SYNC_parameter_command,&size);
if (size&&!yon_char_is_empty(parsed[0])&&strcmp(parsed[0],"(null)\n")){

Loading…
Cancel
Save