master c29fb3e0d8 1/2: Never return tooltip frames from ns-begin-drag

[Po Lu]

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

    Never return tooltip frames from ns-begin-drag
    
    * src/nsterm.m ([EmacsWindow draggedImage:movedTo:]):
    ([EmacsWindow beginDrag:forPasteboard...]): Don't return frame
    if tooltip.
---
 src/nsterm.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index 3b2830e73d..891d52ea3f 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -9651,7 +9651,8 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c)
        dnd_mode = RETURN_FRAME_NOW;
 
       if (dnd_mode != RETURN_FRAME_NOW
-         || ![[w delegate] isKindOfClass: [EmacsView class]])
+         || ![[w delegate] isKindOfClass: [EmacsView class]]
+         || ((EmacsView *) [w delegate])->emacsframe->tooltip)
        goto out;
 
       dnd_return_frame = ((EmacsView *) [w delegate])->emacsframe;
@@ -9709,7 +9710,8 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c)
                        belowWindowWithWindowNumber: 0];
       w = [NSApp windowWithWindowNumber: window_number];
 
-      if (w && [[w delegate] isKindOfClass: [EmacsView class]])
+      if (w && [[w delegate] isKindOfClass: [EmacsView class]]
+         && !((EmacsView *) [w delegate])->emacsframe->tooltip)
        {
          *frame_return = ((EmacsView *) [w delegate])->emacsframe;
          [image release];