Исправил баг с сохранением зоны

pull/101/head
Igor Belitskiy 3 years ago
parent 66581a3b31
commit e3c2ceda58

@ -513,13 +513,14 @@ void MainWindow::save_global_local_cfg() {
cmd_zone = "ubconfig --target system set clock ZONE="; cmd_zone = "ubconfig --target system set clock ZONE=";
this->enter_zone(cmd_zone); this->enter_zone(cmd_zone);
} }
if ((this->check_config("region", 0) == false || this->check_config("zone", 0) == false)) { }
if ((this->check_config("region", 1) == false || this->check_config("zone", 1) == false)) {
if (flag_global == false) { if (flag_global == false) {
cmd_zone = "ubconfig --target global set clock ZONE="; cmd_zone = "ubconfig --target global set clock ZONE=";
this->enter_zone(cmd_zone); this->enter_zone(cmd_zone);
} }
} }
}
if (this->check_config("dhcp", 0) == false) { if (this->check_config("dhcp", 0) == false) {
if (flag_local == false) { if (flag_local == false) {
cmd_default = "ubconfig --target system set network NTPSERVERS=default"; cmd_default = "ubconfig --target system set network NTPSERVERS=default";
@ -609,11 +610,9 @@ bool MainWindow::check_config(string key, int key_save) {
map_config_data_local_old.find(key) != map_config_data_local_old.end()) { 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] || if (map_config_data_global[key] != map_config_data_local_old[key] ||
map_config_data_global_old[key] != map_config_data_local[key]) { map_config_data_global_old[key] != map_config_data_local[key]) {
cout << 111 << endl;
return false; return false;
} }
if (map_config_data_global[key] != map_config_data_local[key]) { if (map_config_data_global[key] != map_config_data_local[key]) {
cout << 222 << endl;
return false; return false;
} }
} }

Loading…
Cancel
Save