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

display: Avoid crashing when a monitor doesn't have a mode set

Browse source 
In this case just avoid showing information we don't have.
This commit is contained in:
Rui Matos 2017-08-25 15:57:13 +02:00
parent 337802315c
commit dae238cc5f
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1082,7 +1082,7 @@ static gboolean
should_show_scale_row (CcDisplayMonitor *output)
{
CcDisplayMode *mode = cc_display_monitor_get_mode (output);
return n_supported_scales (mode) > 1;
return mode ? n_supported_scales (mode) > 1 : FALSE;
}
static void
@ -1130,6 +1130,9 @@ get_display_scales (CcDisplayMonitor *output,
guint n, i, j;
mode = cc_display_monitor_get_mode (output);
if (!mode)
return;
all_scales = cc_display_mode_get_supported_scales (mode);
n = n_supported_scales (mode);
if (n <= MAX_N_SCALES)
@ -3074,6 +3077,9 @@ get_resolution_string (CcDisplayMode *mode)
{
char *resolution;
if (!mode)
return "";
resolution = g_object_get_data (G_OBJECT (mode), "resolution");
if (resolution)
return resolution;
@ -3088,6 +3094,9 @@ get_frequency_string (CcDisplayMode *mode)
{
char *frequency;
if (!mode)
return "";
frequency = g_object_get_data (G_OBJECT (mode), "frequency");
if (frequency)
return frequency;