From 20972038b7285eec9bb1a507e852f319e7bf4731 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 1 Oct 2024 09:16:51 +0600
Subject: [PATCH] Fix for configuration before all configuration pages are
 passed

---
 source/ubinstall-gtk.c | 4 +++-
 source/ubinstall-gtk.h | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index a00a755..eb1ef8f 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -846,6 +846,7 @@ void config_init(){
     main_config.progress_thread=0;
     main_config.install_complete=0;
     main_config.save_done=0;
+    main_config.save_configured=0;
     main_config.configure_mode=0;
     main_config.load_mode=-1;
     main_config.log_progress_buzy=0;
@@ -978,7 +979,7 @@ void *on_config_save(void *data){
         g_mutex_lock(&main_config.install_mutex);
         main_config.install_complete=1;
         g_mutex_unlock(&main_config.install_mutex);
-            if (!main_config.save_done){
+            if (!main_config.save_done&&main_config.save_configured){
                 on_setup_system_configuration(widgets);
             }
     return 0;
@@ -1742,6 +1743,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
                             gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
                             gtk_widget_set_sensitive(widgets->NextButton,0);
                             gtk_widget_set_sensitive(widgets->BackButton,0);
+                            main_config.save_configured=1;
                         }
                     } else {
                         gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_CONFIGURE_END);
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index 67706dd..692c455 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -196,6 +196,7 @@ typedef struct {
 	int password_min_length;
 
 	int save_done;
+	int save_configured;
 	int load_mode;
  
 	int install_complete;