From e8f84f8610fd3543c91015665b5a05eb2f326da1 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 12:33:12 +0600 Subject: [PATCH] Fixed wrong parameter loading if there's no value in config --- source/ubl-settings-video.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index dd09caa..6dfcbc5 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -520,7 +520,7 @@ void yon_interface_update(){ gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),2); gtk_entry_set_text(GTK_ENTRY(main_config.widgets->OptirunEntry),optirun); } else if (yon_char_is_empty(optirun)) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),1); + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),0); else gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),0); @@ -528,16 +528,16 @@ void yon_interface_update(){ gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),2); gtk_entry_set_text(GTK_ENTRY(main_config.widgets->PrimusrunEntry),primusrun); } else if (yon_char_is_empty(primusrun)) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),1); + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),0); else gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),0); - if (!yon_char_is_empty(gapfix1)) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),2); - else if (!yon_char_is_empty(gapfix2)) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),3); - else - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),1); + // if (!yon_char_is_empty(gapfix1)) + // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),2); + // else if (!yon_char_is_empty(gapfix2)) + // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),3); + // else + // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),1); yon_monitor_view_update(); } @@ -828,8 +828,7 @@ void on_monitor_configure(GtkWidget *self,monitor_data *window){ g_signal_connect(G_OBJECT(monitors->ParameterLineCheck), "toggled", G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button), monitors->ParameterLineEntry); g_signal_connect(G_OBJECT(monitors->UnsupportedCheck), "toggled", G_CALLBACK(on_resolutions_unsupported_show),monitors); g_signal_connect(G_OBJECT(monitors->PortCombo), "changed", G_CALLBACK(on_port_chosen_changed),monitors); - - gtk_window_set_title(GTK_WINDOW(monitors->MainWindow),TITLE_LABEL); + yon_gtk_window_setup(GTK_WINDOW(monitors->MainWindow),GTK_WINDOW(main_config.widgets->Window),TITLE_LABEL,"com.ublinux.ubl-settings-video","VieoConfigWindow"); char *target = (char*)gtk_label_get_text(GTK_LABEL(window->NameLabel));