From 02bb3295512363099cc4c568bb8b9a45fd2b7dd0 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Wed, 29 May 2013 19:40:33 -0700
Subject: [PATCH] Mixer: Fix connection DND.

---
 lib/ntk                 | 2 +-
 mixer/src/JACK_Module.C | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/ntk b/lib/ntk
index a6ac4c8..02768c4 160000
--- a/lib/ntk
+++ b/lib/ntk
@@ -1 +1 @@
-Subproject commit a6ac4c8bab5d3b41f382493ab0b1b89ce2d3df92
+Subproject commit 02768c459a81592abaa50c6095b3a60b1049b4fc
diff --git a/mixer/src/JACK_Module.C b/mixer/src/JACK_Module.C
index daaec68..182075c 100644
--- a/mixer/src/JACK_Module.C
+++ b/mixer/src/JACK_Module.C
@@ -514,11 +514,12 @@ JACK_Module::handle ( int m )
         case FL_PUSH:
             return Module::handle(m) || 1;
         case FL_RELEASE:
+            Fl::selection_owner(0);
             receptive_to_drop = NULL;
             return Module::handle(m) || 1;
         case FL_DRAG:
         {
-            if ( ! Fl::event_inside( this ) )
+            if ( ! Fl::event_inside( this ) && ! Fl::selection_owner() )
             {
                 DMESSAGE( "initiation of drag" );
 
@@ -538,6 +539,8 @@ JACK_Module::handle ( int m )
                
                 Fl::copy(s, strlen(s) + 1, 0);
 
+                Fl::selection_owner(this);
+
                 free( s );
 
                 Fl::dnd();
@@ -562,6 +565,7 @@ JACK_Module::handle ( int m )
             }
             return 1;
         case FL_DND_RELEASE:
+            Fl::selection_owner(0);
             receptive_to_drop = NULL;
             redraw();
             return 1;