[mutter/gnome-3-18] window: Properly update window->monitor for the desktop window

[Rui Matos <rtcm src gnome org>]

commit c5f40f7481d6fece4bf8781dd032fceca5a2bf77
Author: Rui Matos <tiagomatos gmail com>
Date:   Sat Oct 24 18:46:12 2015 +0200

    window: Properly update window->monitor for the desktop window
    
    We don't want to move the desktop window but we still need to update
    window->monitor or otherwise we'll be left with a pointer to invalid
    memory.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=757148

 src/core/window.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index a3973ca..69ea968 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -3534,10 +3534,7 @@ meta_window_update_for_monitors_changed (MetaWindow *window)
 {
   const MetaMonitorInfo *old, *new;
 
-  if (window->type == META_WINDOW_DESKTOP)
-    return;
-
-  if (window->override_redirect)
+  if (window->override_redirect || window->type == META_WINDOW_DESKTOP)
     {
       meta_window_update_monitor (window, FALSE);
       return;