Исправлен логика аппаратных часов

source/ubl-settings-datetime.cc

@@ -363,8 +363,7 @@ void MainWindow::load_globl_cfg() {
     string cmd_zone = "/usr/bin/ubconfig --default --source global get clock ZONE";
     this->fill_in_reg_zone(cmd_zone);
     string hw = "/usr/bin/ubconfig --source global get clock HWCLOCK_SYNC";
-    string hw_default = "/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC";
-    this->entry_hardware_clock(hw, hw_default);
+    this->entry_hardware_clock(hw);
     info_warning_error(1);
 }
 
@@ -378,7 +377,7 @@ void MainWindow::save_local_cfg() {
     this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp);
     string local = "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=localtime";
     string hw = "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc";
-    this->hardware_clock_global(local, hw);
+    this->entry_hardware_clock(hw);
     info_warning_error(2);
 }
 
@@ -497,29 +496,7 @@ void MainWindow::hardware_clock_global(string &local, string &etc) {
     }
 }
 
-void MainWindow::entry_hardware_clock_default(string &cmd_default) {
-    int error = warning_info;
-    struct Result<string> 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_default.error == 3) {
-        if (error != warning_info) {
-            warning_info = error;
-        }
-        cbHw->set_active(-1);
-    }
-    
-}
-
-void MainWindow::entry_hardware_clock(string &cmd, string &cmd_default) {
+void MainWindow::entry_hardware_clock(string &cmd) {
     int error = warning_info;
     struct Result<string> obj_result = this->wrapper_call(cmd);
     if (obj_result.error == 0) {
@@ -530,18 +507,11 @@ void MainWindow::entry_hardware_clock(string &cmd, string &cmd_default) {
             cbHw->set_active(1);
         }
         else {
-            this->entry_hardware_clock_default(cmd_default);
+            cbHw->set_active(-1);
         }
     }
-    else if (obj_result.error == 3) {
-        if (error != warning_info) {
-            warning_info = error;
-        }
-        cbHw->set_active(-1);
-        this->entry_hardware_clock_default(cmd_default);
-    }
     else { 
-        this->entry_hardware_clock_default(cmd_default);
+        cbHw->set_active(-1);
     }
     
 }

source/ubl-settings-datetime.h

@@ -143,8 +143,7 @@ class MainWindow : public Gtk::ApplicationWindow {
         void hardware_clock_global(string &local, string &etc);
         void info_warning_error(int mess);
         void synopsis_show();
-        void entry_hardware_clock(string &cmd, string &cmd_default);
-        void entry_hardware_clock_default(string &cmd_default);
+        void entry_hardware_clock(string &cmd);
         void save_global_local_cfg();
         void fill_in_reg_zone(string &cmd);
         void load_globl_cfg();