[mutter/upstream-master] MetaMonitorManager: ignore hotplug_mode_update at startup

[Marco Trevisan <marcotrevi src gnome org>]

commit 183f4b0c13f3dc9565bf5f693f2e5d61ca0199c9
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date:   Thu May 25 13:15:06 2017 +0800

    MetaMonitorManager: ignore hotplug_mode_update at startup
    
    hotplug_mode_update is used (mostly by VMs nowadays, and
    VMware has implemented it) to inform that modes list (including
    the preferred one) might change after an uevent.
    
    However, when using MetaMonitorConfigManager we should
    ignore this value at initialization level, or mutter
    won't restore the configured values at startup.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=783073

 src/backends/meta-monitor-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index b0a8dbb..eea84c7 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -392,7 +392,8 @@ meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager)
 static gboolean
 should_use_stored_config (MetaMonitorManager *manager)
 {
-  return !meta_monitor_manager_has_hotplug_mode_update (manager);
+  return (manager->in_init ||
+          !meta_monitor_manager_has_hotplug_mode_update (manager));
 }
 
 static void