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

display: Early return in monitor_labeler_show() if no outputs are available

Browse source 
The GVariant constructed here would be useless otherwise, since there are
no outputs to show the labels for. Besides, calling g_variant_builder_close
in this scenario would hit an assertion and the program would crash.

https://gitlab.gnome.org/GNOME/gnome-control-center/issues/12
This commit is contained in:
Mario Sanchez Prada 2018-03-12 14:04:05 +00:00 • committed by Georges Basile Stavracas Neto
parent 729db87249
commit ca9228bb59
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -207,13 +207,16 @@ monitor_labeler_show (CcDisplayPanel *self)
if (!priv->shell_proxy || !priv->current_config) if (!priv->shell_proxy || !priv->current_config)
return; return;
outputs = g_object_get_data (G_OBJECT (priv->current_config), "ui-sorted-outputs");
if (!outputs)
return;
if (cc_display_config_is_cloning (priv->current_config)) if (cc_display_config_is_cloning (priv->current_config))
return monitor_labeler_hide (self); return monitor_labeler_hide (self);
g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE); g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_open (&builder, G_VARIANT_TYPE_ARRAY); g_variant_builder_open (&builder, G_VARIANT_TYPE_ARRAY);
outputs = g_object_get_data (G_OBJECT (priv->current_config), "ui-sorted-outputs");
for (l = outputs; l != NULL; l = l->next) for (l = outputs; l != NULL; l = l->next)
{ {
CcDisplayMonitor *output = l->data; CcDisplayMonitor *output = l->data;