(xmenu_show): Test XtWindowToWidget before inserting into the event_queue.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index 46968f83e0c..2133ad51538 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1323,13 +1323,16 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
         }
 
       XtDispatchEvent (&event);
-      queue_tmp = (struct event_queue *) malloc (sizeof (struct event_queue));
-
-      if (queue_tmp != NULL) 
+      if (XtWindowToWidget(event.xany.window) != menu)
         {
-          queue_tmp->event = event;
-          queue_tmp->next = queue;
-          queue = queue_tmp;
+          queue_tmp = (struct event_queue *) malloc (sizeof (struct event_queue));
+
+          if (queue_tmp != NULL) 
+            {
+              queue_tmp->event = event;
+              queue_tmp->next = queue;
+              queue = queue_tmp;
+            }
         }
     }