From a24fa2071cb1479faca5558f8a976359e62292ca Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 6 Mar 2023 10:25:59 +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=20utc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 26fbbc8..d1511fd 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -445,10 +445,10 @@ void MainWindow::hardware_clock_global(string &local, string &etc){ void MainWindow::entry_hardware_clock(string &cmd, string &cmd_default){ struct Result obj_result = this->wrapper_call(cmd); if (obj_result.error == 0){ - if (obj_result.response == "localtime"){ + if (obj_result.response.find("localtime")!=string::npos){ cbHw->set_active(0); } - else if (obj_result.response == "etc"){ + else if (obj_result.response.find("utc")!=string::npos){ cbHw->set_active(1); } } @@ -457,19 +457,20 @@ void MainWindow::entry_hardware_clock(string &cmd, string &cmd_default){ cbHw->set_active(-1); } else{ - struct Result obj_result = this->wrapper_call(cmd_default); - if (obj_result.error == 0){ - if (obj_result.response == "localtime"){ - cbHw->set_active(0); + struct Result obj_result_default = this->wrapper_call(cmd_default); + if (obj_result_default.error == 0){ + if (obj_result_default.response.find("localtime")!=string::npos){ + cbHw->set_active(0); + } + else if (obj_result_default.response.find("utc")!=string::npos){ + cbHw->set_active(1); + } } - else if (obj_result.response == "etc"){ - cbHw->set_active(1); + else if (obj_result_default.error == 3){ + warning_info-=1; + cbHw->set_active(-1); } - } - else if (obj_result.error == 3){ - warning_info-=1; - cbHw->set_active(-1); - } + } }