From 50aa52d4da5b09dd4f3f8cdd916718bc514445fa Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 12 Jan 2026 13:15:08 +0000 Subject: [PATCH] Fixed cancel confirmation window closing --- source/ubinstall-gtk-page-switch.c | 34 +++++++++++------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index 8536df3..6479ffb 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -485,30 +485,20 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){ data->title=WARNING_TITLE_LABEL; if (yon_confirmation_dialog_call(widgets->MainWindow,data)==GTK_RESPONSE_ACCEPT ){ pthread_cancel((pthread_t)main_config.install_thread); + gtk_button_set_label(GTK_BUTTON(widgets->NextButton),NEXT_LABEL); + GtkWidget *image = gtk_button_get_image(GTK_BUTTON(widgets->NextButton)); + gtk_image_set_from_icon_name(GTK_IMAGE(image),arrow_right_icon_path,GTK_ICON_SIZE_BUTTON); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LicenseAgreeRadio))){ + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_SECTIONS); + } else { + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_WELCOME); + } + yon_page_update(widgets); + main_config.save_done=0; + main_config.install_complete=0; + main_config.install_thread=0; } } - // gtk_widget_hide(widgets->BackButton); - // gtk_widget_hide(widgets->SourceButton); - // gtk_widget_show(widgets->NextButton); - // gtk_widget_show(widgets->StartScenarioButton); - // gtk_widget_set_sensitive(widgets->CancelInstallButton,0); - // gtk_widget_set_sensitive(widgets->BackButton,1); - // gtk_widget_set_sensitive(widgets->NextButton,1); - // gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,1); - // gtk_widget_show(widgets->NextButton); - // gtk_widget_show(widgets->BackButton); - gtk_button_set_label(GTK_BUTTON(widgets->NextButton),NEXT_LABEL); - GtkWidget *image = gtk_button_get_image(GTK_BUTTON(widgets->NextButton)); - gtk_image_set_from_icon_name(GTK_IMAGE(image),arrow_right_icon_path,GTK_ICON_SIZE_BUTTON); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LicenseAgreeRadio))){ - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_SECTIONS); - } else { - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_WELCOME); - } - yon_page_update(widgets); - main_config.save_done=0; - main_config.install_complete=0; - main_config.install_thread=0; } void on_additional_page_clicked(GtkWidget *, main_window *widgets){