master 021dbdb128: * src/xterm.c (x_dnd_begin_drag_and_drop): Fix test against DND frame.

[Po Lu]

branch: master
commit 021dbdb1287de0f5502eac00fee8d43b8d22db55
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    * src/xterm.c (x_dnd_begin_drag_and_drop): Fix test against DND frame.
---
 src/xterm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 3d0d826409..e4c17644e4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6949,8 +6949,8 @@ x_dnd_begin_drag_and_drop (struct frame *f, Time time, 
Atom xaction,
   int finish;
 #endif
   XWindowAttributes root_window_attrs;
-
   struct input_event hold_quit;
+  struct frame *any;
   char *atom_name;
   Lisp_Object action, ltimestamp;
   specpdl_ref ref;
@@ -7110,8 +7110,9 @@ x_dnd_begin_drag_and_drop (struct frame *f, Time time, 
Atom xaction,
      loop, so when dragging items to itself, always return
      XdndActionPrivate.  */
   if (x_dnd_end_window != None
-      && (x_any_window_to_frame (FRAME_DISPLAY_INFO (f),
-                                x_dnd_end_window) != f))
+      && (any = x_any_window_to_frame (FRAME_DISPLAY_INFO (f),
+                                      x_dnd_end_window))
+      && (any != f))
     return QXdndActionPrivate;
 
   if (x_dnd_action != None)