From 6a805d8051c8a9976b9df6acf9ce509cc8e3a37c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 7 Aug 2024 18:00:33 +0600 Subject: [PATCH] Test fix for installation error crash --- source/ubinstall-gtk.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 596bd45..5c105c6 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -1046,9 +1046,24 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ gtk_widget_hide(widgets->SaveButton); break; - case YON_PAGE_INSTALL_ERROR: + case YON_PAGE_INSTALL_ERROR:{ on_summary_log_view((GtkWidget*)NULL); - [[fallthrough]]; + + yon_switch_page_render(widgets,7); + gtk_widget_set_sensitive(widgets->BackButton,0); + gtk_widget_hide(gtk_widget_get_parent(widgets->PackageInstallationProgress)); + gtk_widget_hide(widgets->InstallationLabel); + gtk_widget_hide(widgets->PackageInstallationLabel); + gtk_widget_set_sensitive(widgets->NextButton,1); + gtk_widget_set_sensitive(widgets->CancelInstallButton,1); + main_config.install_complete=0; + main_config.save_done=0; + gtk_button_set_label(GTK_BUTTON(widgets->NextButton),RESTART_LABEL); + gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL); + gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->NextButton))), + "com.ublinux.ubinstall-gtk.sync-symbolic",GTK_ICON_SIZE_BUTTON); + + } break; case YON_PAGE_COMPLETION:{ yon_switch_page_render(widgets,7); gtk_widget_set_sensitive(widgets->BackButton,0); @@ -1198,7 +1213,6 @@ if (window->Window){ main_config.log_progress_buzy=0; if (size){ char *final = yon_char_parsed_to_string(parsed,size,""); - // char *prev = (char*)gtk_label_get_text(GTK_LABEL(window->LogLabel)); gtk_label_set_text(GTK_LABEL(window->LogLabel),final); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->ScrollToEndCheck))){ gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)),gtk_adjustment_get_upper(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)))); @@ -1835,6 +1849,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ switch (page){ case YON_PAGE_COMPLETION: case YON_PAGE_INSTALL_ERROR:{ + // GtkWidget *dialog = gtk_dialog_new(); gtk_main_quit(); }break; default:{