Исправлен баг с ошибкой чтения конфигурации

pull/71/head
Igor Belitskiy 3 years ago
parent a24fa2071c
commit 4e651540dc

@ -466,7 +466,7 @@ void MainWindow::entry_hardware_clock(string &cmd, string &cmd_default){
cbHw->set_active(1); cbHw->set_active(1);
} }
} }
else if (obj_result_default.error == 3){ else if (obj_result_default.error != 0){
warning_info-=1; warning_info-=1;
cbHw->set_active(-1); cbHw->set_active(-1);
} }
@ -937,8 +937,12 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex
if (region=="Etc" && zone==""){ if (region=="Etc" && zone==""){
warning_info-=1; warning_info-=1;
} }
else if (region==""){ else if (region=="" && zone==""){
warning_info+=1; warning_info+=1;
int error = warning_info;
if (warning_info!=error){
warning_info=error;
}
} }
} }

@ -817,7 +817,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-start">8</property> <property name="margin-start">8</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">13</property>
<property name="label" translatable="yes" context="Region" comments="Region">Region</property> <property name="label" translatable="yes" context="Region" comments="Region">Region</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
@ -829,7 +829,7 @@ Format: DD.MM.YYYY</property>
</child> </child>
<child> <child>
<object class="GtkComboBoxText" id="cbRegion"> <object class="GtkComboBoxText" id="cbRegion">
<property name="width-request">167</property> <property name="width-request">172</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -851,9 +851,9 @@ Format: DD.MM.YYYY</property>
<object class="GtkLabel" id="lblZone"> <object class="GtkLabel" id="lblZone">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">10</property> <property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">10</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">13</property> <property name="margin-bottom">13</property>

Loading…
Cancel
Save