From 98d13b32f5fe273ef73329a40e446d99095ee1f8 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 24 Mar 2026 17:30:10 +0600 Subject: [PATCH] Fixed close postsave action combo box --- locale/ubinstall-gtk.pot | 3 +++ locale/ubinstall-gtk_ru.po | 5 ++++- source/ubinstall-gtk-page-switch.c | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 49bdd66..e110b2b 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -5336,4 +5336,7 @@ msgstr "" #: source/libublsettingsui-gtk3.h:675 msgid "Uncheck all" +msgstr "" + +msgid "Close installer" msgstr "" \ No newline at end of file diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 65f4f4a..2eac892 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -5531,4 +5531,7 @@ msgstr "Предоставить root-доступ" #: source/libublsettingsui-gtk3.h:675 msgid "Uncheck all" -msgstr "Снять всё" \ No newline at end of file +msgstr "Снять всё" + +msgid "Close installer" +msgstr "Закрыть установщик" \ No newline at end of file diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index aef5eda..1f01c48 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -301,7 +301,14 @@ int yon_page_save(main_window *widgets, enum YON_PAGES page){ return yon_installation_start(widgets); break; case YON_PAGE_CONFIGURE_END: - return yon_config_save(widgets); + int status = yon_config_save(widgets); + if (status){ + const char *endaction = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo)); + if (!yon_char_is_empty(endaction)&&!strcmp(endaction,"close")){ + on_exit_accepted(widgets); + } + } + return status; default:return 1; } return 1;