Configuration restoring moved to exiting installer

pull/286/head
parent 33d426a3d8
commit bb8a216c11

@ -525,6 +525,8 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
case YON_PAGE_INSTALL_ERROR: case YON_PAGE_INSTALL_ERROR:
case YON_PAGE_CONFIGURE_SAVE: case YON_PAGE_CONFIGURE_SAVE:
case YON_PAGE_COMPLETION: case YON_PAGE_COMPLETION:
yon_config_restore(widgets);
gtk_main_quit(); gtk_main_quit();
break; break;
default: { default: {

@ -93,7 +93,6 @@ void on_config_global_save(GtkWidget *,main_window *widgets){
gboolean on_install_success(main_window *widgets){ gboolean on_install_success(main_window *widgets){
gtk_label_set_text(GTK_LABEL(widgets->InstallationLabel),""); gtk_label_set_text(GTK_LABEL(widgets->InstallationLabel),"");
yon_config_restore(widgets);
on_page_next_clicked(NULL,widgets); on_page_next_clicked(NULL,widgets);
return 0; return 0;

@ -234,6 +234,7 @@ void on_reboot_accepted(main_window *widgets){
g_mutex_unlock(&main_config.install_mutex); g_mutex_unlock(&main_config.install_mutex);
} }
main_config.exit_accepted=1; main_config.exit_accepted=1;
yon_config_restore(widgets);
while(gtk_events_pending()) gtk_main_iteration(); while(gtk_events_pending()) gtk_main_iteration();
if (system("reboot")){}; if (system("reboot")){};
@ -242,12 +243,13 @@ void on_reboot_accepted(main_window *widgets){
} }
} }
void on_exit_accepted(main_window *){ void on_exit_accepted(main_window *widgets){
g_mutex_lock(&main_config.install_mutex); g_mutex_lock(&main_config.install_mutex);
if (main_config.install_thread){ if (main_config.install_thread){
pthread_cancel((pthread_t)main_config.install_thread); pthread_cancel((pthread_t)main_config.install_thread);
g_mutex_unlock(&main_config.install_mutex); g_mutex_unlock(&main_config.install_mutex);
} }
yon_config_restore(widgets);
main_config.exit_accepted=1; main_config.exit_accepted=1;
while(gtk_events_pending()) gtk_main_iteration(); while(gtk_events_pending()) gtk_main_iteration();
} }
@ -265,6 +267,7 @@ gboolean on_yon_exit(GtkWidget *,GdkEvent*, main_window *widgets){
return 1; return 1;
} }
} else { } else {
yon_config_restore(widgets);
on_exit_accepted(widgets); on_exit_accepted(widgets);
gtk_main_quit(); gtk_main_quit();
} }

Loading…
Cancel
Save