source/ubl-settings-video.c

@@ -582,7 +582,8 @@ void yon_set_sensitive_from_combo_box(GtkComboBox *toggle, GtkWidget *target){
 }
 
 void on_database_update(void *,void *widgets){
-    yon_terminal_window_launch(GTK_WINDOW(((main_window*)widgets)->Window),pacman_update_command,yon_char_get_localised_from_lib(SUCCESS_LABEL),OPERATION_FAIL_LABEL);
+    terminal_window_struct *window = yon_terminal_window_launch(GTK_WINDOW(((main_window*)widgets)->Window),pacman_update_command,yon_char_get_localised_from_lib(SUCCESS_LABEL),OPERATION_FAIL_LABEL);
+    g_signal_connect(G_OBJECT(window->window),"destroy",G_CALLBACK(yon_proprietary_get_thread),widgets);
 }
 
 void on_gapfix_changed(GtkWidget*, main_window *widgets){
@@ -905,7 +906,6 @@ template_main_window *yon_main_window_complete(main_window *widgets){
 
     yon_save_window_set_postsave_function(on_save_done,widgets);
     on_config_local_load(NULL,widgets);
-        yon_proprietary_get_thread(NULL,(main_window*)widgets);
 
     yon_gtk_combo_box_block_scroll(GTK_COMBO_BOX(widgets->KernelsCombo));
     yon_gtk_combo_box_block_scroll(GTK_COMBO_BOX(widgets->OptirunCombo));
@@ -943,7 +943,6 @@ void config_init(){
     main_config.progress_active=0;
     main_config.ports_table = g_hash_table_new_full(g_str_hash,g_str_equal,free,free);
     main_config.resolutions = g_hash_table_new_full(g_str_hash,g_str_equal,free,free);
-    yon_packages_init();
     yon_monitor_set_resolutions();
     yon_all_resolutions_update();
 }
@@ -966,10 +965,16 @@ int main(int argc, char *argv[]){
         if (system(yon_check_database_command)){
             dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
             data->action_text=DATABASE_UNACCESSIBLE_LABEL;
-            data->function = on_database_update;
-            data->data = widgets;
-            yon_confirmation_dialog_call(widgets->HeadOverlay,data);
+            if (yon_confirmation_dialog_call(widgets->HeadOverlay,data) != GTK_RESPONSE_CANCEL){
+                on_database_update(NULL,widgets);
+            } else {
+            on_update_clicked(NULL,widgets);
+
+            }
+        } else {
+            on_update_clicked(NULL,widgets);
         }
+        yon_packages_init();
         gtk_main();
         yon_packages_finish();
         return 0;