summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2006-03-06 16:37:01 +0000
committerRyan Lortie <ryanl@src.gnome.org>2006-03-06 16:37:01 +0000
commitc28652eccf6f16360315dba1c227817e96e2bc03 (patch)
tree769c189b563d17b4ac81eeb4370628e33a168d29
parent7a83d6f848d1317c5464f848d6c60523b24e8390 (diff)
downloadmetacity-c28652eccf6f16360315dba1c227817e96e2bc03.tar.gz
Only unmaximise window before freeing if the window is actually maximised.
2006-03-06 Ryan Lortie <desrt@desrt.ca> * src/window.c (meta_window_free): Only unmaximise window before freeing if the window is actually maximised. #333563.
-rw-r--r--ChangeLog5
-rw-r--r--src/window.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e55345b..b90aced4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-06 Ryan Lortie <desrt@desrt.ca>
+
+ * src/window.c (meta_window_free): Only unmaximise window before
+ freeing if the window is actually maximised. #333563.
+
2006-02-27 Elijah Newren <newren gmail com>
* NEWS: 2.13.144 release
diff --git a/src/window.c b/src/window.c
index 5f817804..7955102e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -979,7 +979,8 @@ meta_window_free (MetaWindow *window)
if (window->display->focus_window == window)
window->display->focus_window = NULL;
- unmaximize_window_before_freeing (window);
+ if (window->maximized_horizontally || window->maximized_vertically)
+ unmaximize_window_before_freeing (window);
meta_window_unqueue_calc_showing (window);
meta_window_unqueue_move_resize (window);