applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

display: Add guards for NULL display configuration

Browse source 
This may happen under some conditions. Possibly due to a race condition
(i.e. we did not receive any configuration from mutter yet) or also if
we are not running on GNOME.

Add guards for NULL configuration. This configuration is never
applicable and mostly clears the UI.

Fixes: #604
This commit is contained in:
Benjamin Berg 2019-07-03 09:53:38 +02:00 • committed by Georges Basile Stavracas Neto
parent 561ac849d7
commit 345a819f84
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
panels/display/cc-display-panel.c
View file

@ -745,6 +745,12 @@ rebuild_ui (CcDisplayPanel *panel)
g_list_store_remove_all (panel->primary_display_list);
gtk_list_store_clear (panel->output_selection_list);
if (!panel->current_config)
{
panel->rebuilding_counter--;
return;
}
n_active_outputs = 0;
n_usable_outputs = 0;
outputs = cc_display_config_get_ui_sorted_monitors (panel->current_config);
@ -987,6 +993,12 @@ update_apply_button (CcDisplayPanel *panel)
gboolean config_equal;
g_autoptr(CcDisplayConfig) applied_config = NULL;
if (!panel->current_config)
{
reset_titlebar (panel);
return;
}
applied_config = cc_display_config_manager_get_current (panel->manager);
config_equal = cc_display_config_equal (panel->current_config,