Исправил баг с глобальным сохранением

pull/11/head
Igor Belitskiy 3 years ago
parent cb9204f4f9
commit caa7845f0e

@ -78,8 +78,9 @@ void MainWindow::settings(){
btnBoxAboutDialog->set_visible(false);
ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I);
if (this->check_root() == 0) {
spbSecond->set_range(1, 60);
spbSecond->set_range(0, 60);
spbSecond->set_increments(1.0, 1.0);
spbSecond->set_value(1);
this->fill_in_view();
this->change_password_protecc();
this->change_security_login();
@ -627,6 +628,7 @@ void MainWindow::get_menu_boot(string cmd, std::map <string, string> &map_temp)
chbLoadVariantSelectionTimer->set_active(true);
spbSecond->set_sensitive(true);
lblInfoSeconds->set_sensitive(true);
}
else if (res_response.error == 3) {
if (start_error != index_error) {
@ -650,12 +652,22 @@ void MainWindow::set_menu_boot(string cmd = "", string cmd_remove = "") {
cmd += to_string(value);
this->wrapper_system(cmd, "");
}
else {
flag_save_local = true;
flag_save_global = true;
flag_save_all = true;
}
map_cmd_selection["GRUB_TIMEOUT"] = to_string(value);
}
else if (chbLoadVariantSelectionTimer->get_active() == false) {
if (cmd_remove.length() != 0) {
this->wrapper_system(cmd_remove, "");
}
else {
flag_save_local = true;
flag_save_global = true;
flag_save_all = true;
}
map_cmd_selection["GRUB_TIMEOUT"] = "";
}
else {
@ -758,7 +770,9 @@ void MainWindow::set_active_boot_second() {
}
void MainWindow::wrapper_save_all_cfg() {
if (this->save_global_cfg() && this->save_local_cfg()) {
bool _flag_local = this->save_local_cfg();
bool _flag_global = this->save_global_cfg();
if (_flag_local && _flag_global) {
this->info_warning_error(5);
flag_save_all = false;
}

Loading…
Cancel
Save