summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Adams <robadams@ucla.edu>2003-03-17 01:19:07 +0000
committerRob Adams <readams@src.gnome.org>2003-03-17 01:19:07 +0000
commit51e74d402717c629a7efb2d3958b1368b447f6cc (patch)
tree7bb099b5243e935439f0a78225a060dd0bc6e71e
parent2d662f67a56fc68881776365de0686500fbafd05 (diff)
downloadmetacity-51e74d402717c629a7efb2d3958b1368b447f6cc.tar.gz
Free old window menu if it already exists so we don't end up with more
2003-03-16 Rob Adams <robadams@ucla.edu> * window.c (meta_window_show_menu): Free old window menu if it already exists so we don't end up with more than one. Fix for #108392.
-rw-r--r--ChangeLog6
-rw-r--r--src/window.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b46ed648..53ba73d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-16 Rob Adams <robadams@ucla.edu>
+
+ * window.c (meta_window_show_menu): Free old window menu if it
+ already exists so we don't end up with more than one. Fix for
+ #108392.
+
2003-03-14 Rob Adams <robadams@ucla.edu>
* contraints.c (get_outermost_screen_positions): Don't try to
diff --git a/src/window.c b/src/window.c
index 1ae7be06..f5bf5c4c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5490,6 +5490,13 @@ meta_window_show_menu (MetaWindow *window,
MetaMenuOp insensitive;
MetaWindowMenu *menu;
+ if (window->display->window_menu)
+ {
+ meta_ui_window_menu_free (window->display->window_menu);
+ window->display->window_menu = NULL;
+ window->display->window_with_menu = NULL;
+ }
+
ops = 0;
insensitive = 0;