From e3c2ceda582f4b8107bae7fb4b82608cc8f56034 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 24 Mar 2023 09:22:17 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D1=81=D0=BE=D1=85=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=B7=D0=BE=D0=BD?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index d77db86..398b0b1 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -513,13 +513,14 @@ void MainWindow::save_global_local_cfg() { cmd_zone = "ubconfig --target system set clock 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) { cmd_zone = "ubconfig --target global set clock ZONE="; this->enter_zone(cmd_zone); } - } } + if (this->check_config("dhcp", 0) == false) { if (flag_local == false) { 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()) { 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; } }