Merge pull request #73 from TomKaltz/master

thx @TomKaltz
punker76 · Sep 25, 2013 · d051d74 · d051d74
2 parents 08a7169 + ec945e2
commit d051d74
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/GongSolutions.Wpf.DragDrop/Utilities/VisualTreeExtensions.cs b/GongSolutions.Wpf.DragDrop/Utilities/VisualTreeExtensions.cs
@@ -49,7 +49,7 @@ public static DependencyObject GetVisualAncestor(this DependencyObject d, Type t
     {
       var item = VisualTreeHelper.GetParent(d.FindVisualTreeRoot());
 
-      while (item != null) {
+      while (item != null && type != null) {
         if (item.GetType() == type || item.GetType().IsSubclassOf(type)) {
           return item;
         }
@@ -104,4 +104,4 @@ public static IEnumerable<T> GetVisualDescendents<T>(this DependencyObject d) wh
       yield break;
     }
   }
-}
+}