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
This commit is contained in:
Rui Matos 2015-10-24 18:46:12 +02:00
parent 2750db2a89
commit 76e816a14f

View File

@ -3534,10 +3534,7 @@ meta_window_update_for_monitors_changed (MetaWindow *window)
{ {
const MetaMonitorInfo *old, *new; const MetaMonitorInfo *old, *new;
if (window->type == META_WINDOW_DESKTOP) if (window->override_redirect || window->type == META_WINDOW_DESKTOP)
return;
if (window->override_redirect)
{ {
meta_window_update_monitor (window, FALSE); meta_window_update_monitor (window, FALSE);
return; return;