Fixes; PC restart return

pull/110/head
parent 22fcc5fcda
commit 19d4dc8ed3
No known key found for this signature in database
GPG Key ID: FF1D842BF4DDE92B

@ -29,9 +29,10 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
case YON_PAGE_RECOVERY_GRUB_UPDATE: return main_config.configure_mode?YON_PAGE_INSTALLATION:YON_PAGE_INSTALLATION_BEGIN; break;
case YON_PAGE_RECOVERY_OS_ONLY: return main_config.configure_mode?YON_PAGE_INSTALLATION:YON_PAGE_INSTALLATION_BEGIN; break;
case YON_PAGE_RECOVERY_USRDATA_ONLY: return main_config.configure_mode?YON_PAGE_INSTALLATION:YON_PAGE_INSTALLATION_BEGIN; break;
case YON_PAGE_COMPLETED:
// case YON_PAGE_COMPLETED:
case YON_PAGE_INSTALL_ERROR:
case YON_PAGE_CONFIGURE_END:
case YON_PAGE_COMPLETION:
on_reboot_accepted(widgets);
break;
default:return YON_PAGE_WELCOME;

@ -354,14 +354,13 @@ void on_gparted_open(){
}
void on_reboot_accepted(main_window *widgets){
void on_reboot_accepted(main_window *){
g_mutex_lock(&main_config.install_mutex);
if (main_config.install_thread){
pthread_cancel((pthread_t)main_config.install_thread);
g_mutex_unlock(&main_config.install_mutex);
}
main_config.exit_accepted=1;
g_signal_emit_by_name(G_OBJECT(widgets->MainWindow),"delete-event");
while(gtk_events_pending()) gtk_main_iteration();
if (system("reboot")){};
}
@ -373,7 +372,6 @@ void on_exit_accepted(main_window *widgets){
g_mutex_unlock(&main_config.install_mutex);
}
main_config.exit_accepted=1;
// g_signal_emit_by_name(G_OBJECT(widgets->MainWindow),"delete-event");
while(gtk_events_pending()) gtk_main_iteration();
gtk_widget_destroy(widgets->MainWindow);
}

Loading…
Cancel
Save