From 7d357424756cb1bd3c90897c27f1e37a90b785c6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 7 Sep 2023 10:42:59 +0600 Subject: [PATCH 1/3] Crash fix --- source/ubl-settings-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index f456e90..8935262 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -561,7 +561,7 @@ void on_proprietary_get(GtkWidget *self, gpointer data){ void on_monitor_configure(GtkWidget *self,monitor_window *window){ if(window&&window->config){ monitor_edit_window *monitors = new(monitor_edit_window); - GtkBuilder *builder = gtk_builder_new_from_resource(glade_path); + GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_configuration); monitors->templateMonitorConfigurationWindow = GTK_WIDGET(gtk_builder_get_object(builder, "templateMonitorConfigurationWindow")); monitors->mainMonitorConfigurationBox = GTK_WIDGET(gtk_builder_get_object(builder, "mainMonitorConfigurationBox")); monitors->templateMonitorConfigurationBox = GTK_WIDGET(gtk_builder_get_object(builder, "templateMonitorConfigurationBox")); From 9abce86d665a56e75e0c84379904d1e5b04b24b9 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 13 Dec 2023 17:30:26 +0600 Subject: [PATCH 2/3] Fixed VGADRV_AUTO saving wrongly --- source/ubl-settings-video.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 8935262..31d4023 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -360,10 +360,10 @@ void on_auto_choose_drivers(GtkWidget *self, widgets_dict *widgets) { int state = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self)); videoconfig.autoChooseDrivers=state; - gtk_widget_set_sensitive(widgets->mainDriverFailsafeNvidiaLabel, !state); - gtk_widget_set_sensitive(widgets->mainDriverFailsafeAMDCombo, !state); - gtk_widget_set_sensitive(widgets->mainDriverFailsafeAMDLabel, !state); - gtk_widget_set_sensitive(widgets->mainDriverFailsafeNvidiaCombo, !state); + // gtk_widget_set_sensitive(widgets->mainDriverFailsafeNvidiaLabel, !state); + // gtk_widget_set_sensitive(widgets->mainDriverFailsafeAMDCombo, !state); + // gtk_widget_set_sensitive(widgets->mainDriverFailsafeAMDLabel, !state); + // gtk_widget_set_sensitive(widgets->mainDriverFailsafeNvidiaCombo, !state); } char *yon_configuration_get_save_command(char *command){ @@ -1664,7 +1664,7 @@ void yon_setup_widgets(widgets_dict *widgets) g_signal_connect(G_OBJECT(widgets->driversInstallButton), "clicked", G_CALLBACK(on_driver_install), widgets); g_signal_connect(G_OBJECT(widgets->driversInfoButton), "clicked", G_CALLBACK(on_driver_info), widgets); - // g_signal_connect(G_OBJECT(widgets->mainDriverAutomaticallyChooseCheck), "toggled", G_CALLBACK(on_auto_choose_drivers), widgets); + g_signal_connect(G_OBJECT(widgets->mainDriverAutomaticallyChooseCheck), "toggled", G_CALLBACK(on_auto_choose_drivers), widgets); // g_signal_connect(G_OBJECT(widgets->mainHybridGraphicsDiscreteCheck), "toggled", G_CALLBACK(on_sensitive_change), widgets); g_signal_connect(G_OBJECT(widgets->mainExtraLaunchOptirunCheck), "toggled", G_CALLBACK(on_sensitive_change), widgets->mainExtraLaunchOptirunEntry); g_signal_connect(G_OBJECT(widgets->mainExtraLaunchPrismusunCheck), "toggled", G_CALLBACK(on_sensitive_change), widgets->mainExtraLaunchPrismusunEntry); From e548dd5ee0326c89e769d69a90e937242f7313fd Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 13 Dec 2023 17:45:42 +0600 Subject: [PATCH 3/3] Replaced VGADRV_AUTO values --- source/ubl-settings-video.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 31d4023..5721c22 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -380,9 +380,9 @@ char *yon_configuration_get_save_command(char *command){ str = yon_char_append(str, yon_char_append(" FAILSAFEATI=", videoconfig.failsafeATI)); else str = yon_char_append(str," FAILSAFEATI=\"\""); - str=yon_char_append(str," VGADRV_AUTO=NO"); + str=yon_char_append(str," VGADRV_AUTO=no"); } else { - str = yon_char_unite(str, " FAILSAFENVIDIA=\"\" FAILSAFEATI=\"\" VGADRV_AUTO=YES", NULL); + str = yon_char_unite(str, " FAILSAFENVIDIA=\"\" FAILSAFEATI=\"\" VGADRV_AUTO=yes", NULL); } if (videoconfig.optirun&&strcmp(videoconfig.optirun, dntus)!=0&&strcmp(videoconfig.optirun, "")!=0) @@ -1260,7 +1260,7 @@ void yon_setup_config(char *configcommand) param=yon_config_get_parameter(videoconfig.loaded_config,videoconfig.configsize,"VGADRV_AUTO"); if (param){ yon_char_divide_search(param,"=",-1); - if (strcmp(param,"NO")!=0) + if (strcmp(param,"no")!=0) videoconfig.autoChooseDrivers=1; }