[gnome-control-center/gnome-3-30] display: Mode compare takes interlaced into account

[Benjamin Berg <bberg src gnome org>]

commit 6116864f563141826a11e596835bca37024c328b
Author: Alex Hirsch <w4rh4wk bluephoenix at>
Date:   Sat Nov 10 20:38:02 2018 +0100

    display: Mode compare takes interlaced into account
    
    When changing the display mode, the apply button does not appear if the
    current mode and new mode differ only in their interlaced flag.
    
    The display mode comparison function now takes the interlaced flag into
    account.
    
    (cherry picked from commit b4809cd21023fb988dd3c4a72b14e2e5bb895061)

 panels/display/cc-display-config-dbus.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/panels/display/cc-display-config-dbus.c b/panels/display/cc-display-config-dbus.c
index b7bb444a1..b74160fdc 100644
--- a/panels/display/cc-display-config-dbus.c
+++ b/panels/display/cc-display-config-dbus.c
@@ -70,7 +70,8 @@ cc_display_mode_dbus_equal (const CcDisplayModeDBus *m1,
 
   return m1->width == m2->width &&
     m1->height == m2->height &&
-    m1->refresh_rate == m2->refresh_rate;
+    m1->refresh_rate == m2->refresh_rate &&
+    (m1->flags & MODE_INTERLACED) == (m2->flags & MODE_INTERLACED);
 }
 
 static void