From 4e651540dc36b16c105fef4bface529b52db0551 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 6 Mar 2023 11:28:40 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=BE=D0=B9=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 8 ++++++-- ubl-settings-datetime.glade | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index d1511fd..00f390d 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -466,7 +466,7 @@ void MainWindow::entry_hardware_clock(string &cmd, string &cmd_default){ cbHw->set_active(1); } } - else if (obj_result_default.error == 3){ + else if (obj_result_default.error != 0){ warning_info-=1; cbHw->set_active(-1); } @@ -937,8 +937,12 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex if (region=="Etc" && zone==""){ warning_info-=1; } - else if (region==""){ + else if (region=="" && zone==""){ warning_info+=1; + int error = warning_info; + if (warning_info!=error){ + warning_info=error; + } } } diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index a2e7320..83274cc 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -817,7 +817,7 @@ Format: DD.MM.YYYY 8 5 6 - 6 + 13 Region 0 @@ -829,7 +829,7 @@ Format: DD.MM.YYYY - 167 + 172 True False 5 @@ -851,9 +851,9 @@ Format: DD.MM.YYYY True False - 10 + 5 5 - 10 + 5 5 6 13