From 77dae8e156db866bbc859fa4c823577ba08f29ab Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Thu, 15 Jan 2026 17:33:04 +0000 Subject: [PATCH] Fixes; Boot load menu fix --- source/ubinstall-gtk-bootloader.c | 1 - source/ubinstall-gtk-log.c | 6 +++++- source/ubinstall-gtk-page-switch.c | 1 + source/ubinstall-gtk-saving.c | 6 +----- source/ubinstall-gtk.h | 3 ++- ubinstall-gtk.glade | 33 ++++++++++++++++++++++-------- 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index ac3e045..a315b5d 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -249,7 +249,6 @@ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){ config_str parsed = yon_char_parse(options[i],&parsed_size,";"); { char *temp = _(parsed[1]); - free(parsed[1]); parsed[1] = yon_char_new(temp); } int have_children=0; diff --git a/source/ubinstall-gtk-log.c b/source/ubinstall-gtk-log.c index 77f24c3..81de549 100644 --- a/source/ubinstall-gtk-log.c +++ b/source/ubinstall-gtk-log.c @@ -124,10 +124,14 @@ void yon_installation_progress_update(GFileMonitor *,GFile *,GFile *,GFileMonito } } -gboolean yon_probress_bar_start(main_window *widgets){ +gboolean yon_progress_bar_start(main_window *widgets){ GFile *file_desc = g_file_new_for_path(progress_path); widgets->install_info_monitor = g_file_monitor_file(file_desc,G_FILE_MONITOR_NONE,NULL,NULL); g_signal_connect(G_OBJECT(widgets->install_info_monitor),"changed",G_CALLBACK(yon_installation_progress_update),widgets); g_object_unref(file_desc); + FILE *file = fopen(progress_path,"w"); + if (file){ + fclose(file); + } return G_SOURCE_REMOVE; } \ No newline at end of file diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index b57c988..c533447 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -494,6 +494,7 @@ 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(main_config.install_thread); + kill(main_config.install_thread,SIGKILL); g_signal_handlers_disconnect_by_func(G_OBJECT(widgets->install_info_monitor),yon_installation_progress_update,widgets); g_file_monitor_cancel(widgets->install_info_monitor); widgets->install_info_monitor = NULL; diff --git a/source/ubinstall-gtk-saving.c b/source/ubinstall-gtk-saving.c index 2bd4b02..21832a6 100644 --- a/source/ubinstall-gtk-saving.c +++ b/source/ubinstall-gtk-saving.c @@ -180,11 +180,7 @@ void *on_config_save(void *data){ yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); return 0; } - FILE *file = fopen(progress_path,"w"); - if (file){ - fclose(file); - } - g_idle_add((GSourceFunc)yon_probress_bar_start,widgets); + g_idle_add((GSourceFunc)yon_progress_bar_start,widgets); if (!main_config.dry_run){ char *command = yon_debug_output("%s\n",save_config_command(yon_char_parsed_to_string(parameters,size," "))); yon_char_parsed_free(parameters,size); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 6ad64d9..897dce7 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -1455,4 +1455,5 @@ void yon_userdata_password_open(GtkWidget *, main_window *widgets); double yon_password_check_func(yon_password_window *window, const char *password_string); void yon_source_update(source_window *window); void yon_main_window_update_locale(main_window *widgets); -gboolean yon_probress_bar_start(main_window *widgets); \ No newline at end of file +gboolean yon_progress_bar_start(main_window *widgets); +void *yon_progress_file_buzyfy(void*); \ No newline at end of file diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 32be6d4..dd07a65 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -300,6 +300,21 @@ + + True + False + + + 100 + 80 + True + True + + + + + + True False @@ -11243,6 +11258,7 @@ separately into the selected partition. True True + never True @@ -11648,6 +11664,7 @@ separately into the selected partition. True True + never True @@ -12057,7 +12074,7 @@ separately into the selected partition. PartitionSize - True + False True 0 @@ -12105,7 +12122,7 @@ separately into the selected partition. True - True + False True 3 @@ -12190,7 +12207,7 @@ separately into the selected partition. True - True + False True 2 @@ -12265,7 +12282,7 @@ separately into the selected partition. * - True + False True 3 @@ -12879,7 +12896,7 @@ separately into the selected partition. 16 - True + False True 0 @@ -12927,7 +12944,7 @@ separately into the selected partition. True - True + False True 4 @@ -13006,7 +13023,7 @@ separately into the selected partition. True - True + False True 4 @@ -13082,7 +13099,7 @@ separately into the selected partition. * - True + False True 4