diff options
| -rw-r--r-- | src/backends/meta-monitor.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c index 92c61c037..60f36741a 100644 --- a/src/backends/meta-monitor.c +++ b/src/backends/meta-monitor.c @@ -203,13 +203,9 @@ meta_monitor_get_main_output (MetaMonitor *monitor) gboolean meta_monitor_is_active (MetaMonitor *monitor) { - MetaOutput *output; - MetaCrtc *crtc; - - output = meta_monitor_get_main_output (monitor); - crtc = meta_output_get_assigned_crtc (output); + MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor); - return crtc && crtc->current_mode; + return !!priv->current_mode; } gboolean @@ -1411,6 +1407,18 @@ meta_monitor_get_current_mode (MetaMonitor *monitor) return priv->current_mode; } +static gboolean +is_current_mode_known (MetaMonitor *monitor) +{ + MetaOutput *output; + MetaCrtc *crtc; + + output = meta_monitor_get_main_output (monitor); + crtc = meta_output_get_assigned_crtc (output); + + return meta_monitor_is_active (monitor) == (crtc && crtc->current_mode); +} + void meta_monitor_derive_current_mode (MetaMonitor *monitor) { @@ -1430,6 +1438,8 @@ meta_monitor_derive_current_mode (MetaMonitor *monitor) } priv->current_mode = current_mode; + + g_warn_if_fail (is_current_mode_known (monitor)); } void |