summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain Holmes <iain@gnome.org>2008-05-19 00:14:09 +0000
committerIain Holmes <iain@src.gnome.org>2008-05-19 00:14:09 +0000
commit3405f3d8c89792acf153e8f4ccb422b935560fa4 (patch)
tree7bf314f68cd1eaa38bee9a63652a8f963cba678f
parentf141692ca241441ddf6b243782ac94a95c861cd3 (diff)
downloadmetacity-3405f3d8c89792acf153e8f4ccb422b935560fa4.tar.gz
Applied patch from Ed Catmur to fix #528787
2008-05-19 Iain Holmes <iain@gnome.org> * src/core/window.c: Applied patch from Ed Catmur to fix #528787 svn path=/trunk/; revision=3716
-rw-r--r--ChangeLog4
-rw-r--r--src/core/window.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 48705973..c44d483d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-05-19 Iain Holmes <iain@gnome.org>
+ * src/core/window.c: Applied patch from Ed Catmur to fix #528787
+
+2008-05-19 Iain Holmes <iain@gnome.org>
+
* src/include/frame.h
* src/include/display.h
* src/include/xprops.h
diff --git a/src/core/window.c b/src/core/window.c
index 188663ad..6d9d314f 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1055,7 +1055,11 @@ meta_window_free (MetaWindow *window,
g_assert (window->display->grab_window != window);
if (window->display->focus_window == window)
- window->display->focus_window = NULL;
+ {
+ window->display->focus_window = NULL;
+ meta_compositor_set_active_window (window->display->compositor,
+ window->screen, NULL);
+ }
if (window->maximized_horizontally || window->maximized_vertically)
unmaximize_window_before_freeing (window);