From ec841973f35dd4f5ceb6be903bf64210668c1329 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Fri, 9 Feb 2024 09:28:05 +0600
Subject: [PATCH] Added new boot option

---
 source/ubl-settings-bootloader.cc | 5 ++++-
 source/ubl-settings-bootloader.h  | 1 +
 ubl-settings-bootloader.pot       | 4 ++++
 ubl-settings-bootloader_ru.po     | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc
index b18da4a..09ef392 100644
--- a/source/ubl-settings-bootloader.cc
+++ b/source/ubl-settings-bootloader.cc
@@ -328,6 +328,7 @@ vector<tuple<string, vector<string>>> MainWindow::format_os_list(vector<string>
 vector<string> MainWindow::pars_os(vector<string> &os_control_list) {
     string str_list_os = obj_process_call.call_all_sections(cmd_pars_list_os);
     os_control_list = Utils::split(str_list_os, '\n');
+    os_control_list.insert(os_control_list.begin(),LAST_MODE_LABEL);
     return os_control_list;
 }
 string MainWindow::pars_last_launched_os() {
@@ -1313,7 +1314,9 @@ void MainWindow::set_data_cfg() {
         map_cmd_selection["GRUB_TIMEOUT"] = "";
     }
     string name_os = entrListOS->get_text();
-    if (name_os.length() != 0) {
+    if (strstr(name_os.c_str(),LAST_MODE_LABEL)){
+        map_cmd_selection["GRUB_DEFAULT"] = "";
+    } else if (name_os.length() != 0) {
         map_cmd_selection["GRUB_DEFAULT"] = name_os;
     }
     else {
diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h
index b13f27b..ef84741 100644
--- a/source/ubl-settings-bootloader.h
+++ b/source/ubl-settings-bootloader.h
@@ -159,6 +159,7 @@ void me_thread(string cmd);
 #define str_add_melody _("Melody added")
 #define str_del_user _("User deleted")
 #define str_del_melody _("Melody deleted")
+#define LAST_MODE_LABEL _("Last succeeded load mode")
 
 class View_edit_add_table {
 private:
diff --git a/ubl-settings-bootloader.pot b/ubl-settings-bootloader.pot
index 820815c..8445b53 100644
--- a/ubl-settings-bootloader.pot
+++ b/ubl-settings-bootloader.pot
@@ -585,3 +585,7 @@ msgstr ""
 #: source/ubl-settings-bootloader.cc:450
 msgid "Нет анимации загрузки, полный журнал"
 msgstr ""
+
+#: source/ubl-settings-bootloader.h:162
+msgid "Last succeeded load mode"
+msgstr ""
\ No newline at end of file
diff --git a/ubl-settings-bootloader_ru.po b/ubl-settings-bootloader_ru.po
index 76d8cf1..0282871 100644
--- a/ubl-settings-bootloader_ru.po
+++ b/ubl-settings-bootloader_ru.po
@@ -628,3 +628,7 @@ msgstr ""
 
 #~ msgid "Disabled"
 #~ msgstr "Отключён"
+
+#: source/ubl-settings-bootloader.h:162
+msgid "Last succeeded load mode"
+msgstr "Последний удачный вариант загрузки"
\ No newline at end of file