[mutter] monitor-manager: Check active monitors when looking for logical monitor
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] monitor-manager: Check active monitors when looking for logical monitor
- Date: Fri, 7 Apr 2017 15:54:49 +0000 (UTC)
commit c214eb15bf836e41c788d709b852004200cd88f2
Author: Jonas Ådahl <jadahl gmail com>
Date: Fri Apr 7 23:41:23 2017 +0800
monitor-manager: Check active monitors when looking for logical monitor
An inactive monitor will not be assigned to a logical monitor, so don't
try to match against those. This avoids a dereferencing a NULL when the
main output of an inactive monitor doesn't have an assigned CRTC.
https://bugzilla.gnome.org/show_bug.cgi?id=777732
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 5657963..6aa997d 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -2950,7 +2950,8 @@ meta_monitor_manager_get_monitor_for_connector (MetaMonitorManager *manager,
{
MetaMonitor *monitor = l->data;
- if (g_str_equal (connector, meta_monitor_get_connector (monitor)))
+ if (meta_monitor_is_active (monitor) &&
+ g_str_equal (connector, meta_monitor_get_connector (monitor)))
{
MetaOutput *main_output = meta_monitor_get_main_output (monitor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]