workspace: ensure that workarea data is valid when fetching by monitor num

https://bugzilla.gnome.org/show_bug.cgi?id=788860

Gbp-Pq: Name 0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch

diff --git a/src/core/workspace.c b/src/core/workspace.c
index f6d3c9619931bcb8b23cff70393847d46dd07352..901de454107a2391099d7c133eea3b188410e4ec 100644 (file)
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -1099,13 +1099,16 @@ meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace,
   MetaLogicalMonitor *logical_monitor;
   MetaWorkspaceLogicalMonitorData *data;
 
-  ensure_work_areas_validated (workspace);
-
   logical_monitor =
     meta_monitor_manager_get_logical_monitor_from_number (monitor_manager,
                                                           which_monitor);
+  g_return_if_fail (logical_monitor != NULL);
+
+  ensure_work_areas_validated (workspace);
   data = meta_workspace_get_logical_monitor_data (workspace, logical_monitor);
 
+  g_return_if_fail (data != NULL);
+
   *area = data->logical_monitor_work_area;
 }