1 files changed, 25 insertions, 26 deletions
diff --git a/Software/Visual_Studio/Tango.DragAndDrop/DragAndDropService.cs b/Software/Visual_Studio/Tango.DragAndDrop/DragAndDropService.cs
index 8833feff8..1c84b8768 100644
--- a/Software/Visual_Studio/Tango.DragAndDrop/DragAndDropService.cs
+++ b/Software/Visual_Studio/Tango.DragAndDrop/DragAndDropService.cs
@@ -597,6 +597,31 @@ namespace Tango.DragAndDrop
         }
 
         /// <summary>
+        /// Handles the Unloaded event of the Element control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
+        private static void Element_Unloaded(object sender, RoutedEventArgs e)
+        {
+            FrameworkElement element = sender as FrameworkElement;
+            UnRegisterDraggable(element);
+            element.PreviewMouseUp -= Draggable_PreviewMouseUp;
+            element.Unloaded -= Element_Unloaded;
+        }
+
+        /// <summary>
+        /// Handles the Unloaded1 event of the Element control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
+        private static void Element_Unloaded1(object sender, RoutedEventArgs e)
+        {
+            FrameworkElement element = sender as FrameworkElement;
+            UnRegisterDroppable(element);
+            element.Unloaded -= Element_Unloaded1;
+        }
+
+        /// <summary>
         /// Registers a framework element as a droppable element.
         /// </summary>
         /// <param name="element">The element.</param>
@@ -814,32 +839,6 @@ namespace Tango.DragAndDrop
             }
         }
 
-        /// <summary>
-        /// Handles the Unloaded event of the Element control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
-        private static void Element_Unloaded(object sender, RoutedEventArgs e)
-        {
-            //FrameworkElement element = sender as FrameworkElement;
-            //UnRegisterDraggable(element);
-        }
-
-        #endregion
-
-        #region Droppable Event Handlers
-
-        /// <summary>
-        /// Handles the Unloaded1 event of the Element control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="RoutedEventArgs"/> instance containing the event data.</param>
-        private static void Element_Unloaded1(object sender, RoutedEventArgs e)
-        {
-            //FrameworkElement element = sender as FrameworkElement;
-            //UnRegisterDroppable(element);
-        }
-
         #endregion
     }
 }