[gnome-control-center] display: Ensure the preselected resolution matches the current mode

[Rui Matos <rtcm src gnome org>]

commit ae113c152297725d9e756dca9398368d480215f3
Author: Rui Matos <tiagomatos gmail com>
Date:   Mon Oct 10 16:45:07 2016 +0200

    display: Ensure the preselected resolution matches the current mode
    
    We need to check the interlaced flag too when preselecting the current
    resolution in the combo box since we now have separate entries for
    interlaced and regular resolutions of the same size.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772708

 panels/display/cc-display-panel.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
index 5504fcb..026e4ba 100644
--- a/panels/display/cc-display-panel.c
+++ b/panels/display/cc-display-panel.c
@@ -1898,7 +1898,8 @@ setup_resolution_combo_box (CcDisplayPanel  *panel,
 
           /* select the current mode in the combo box */
           if (gnome_rr_mode_get_width (modes[i]) == gnome_rr_mode_get_width (current_mode)
-              && gnome_rr_mode_get_height (modes[i]) == gnome_rr_mode_get_height (current_mode))
+              && gnome_rr_mode_get_height (modes[i]) == gnome_rr_mode_get_height (current_mode)
+              && gnome_rr_mode_get_is_interlaced (modes[i]) == gnome_rr_mode_get_is_interlaced 
(current_mode))
             {
               gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->res_combo),
                                              &iter);