Исправлен баг с загрузкой глобальной конфигурации

pull/101/head
Igor Belitskiy 3 years ago
parent 794ed7d7a8
commit 028d5aa60b

@ -104,6 +104,7 @@ void MainWindow::settings() {
this->flag_block_gui();
this->event();
this->parse_text_date();
this->load_globl_cfg();
this->load_local_cfg();
string cmd = "ubconfig --source default get [] NTPSERVERS_DEFAULT";
default_get_dhcp = this->get_ubconfig_value(cmd);
@ -608,9 +609,11 @@ bool MainWindow::check_config(string key, int key_save) {
map_config_data_local_old.find(key) != map_config_data_local_old.end()) {
if (map_config_data_global[key] != map_config_data_local_old[key] ||
map_config_data_global_old[key] != map_config_data_local[key]) {
cout << 111 << endl;
return false;
}
if (map_config_data_global[key] != map_config_data_local[key]) {
cout << 222 << endl;
return false;
}
}

Loading…
Cancel
Save