Merge lp:~3v1n0/nux/check-dnd_area-trusty into lp:nux/trusty

[Marco Trevisan (Treviño)]

WindowCompositor: don't try to use an null dnd_area pointer

[Brandon Schaefer (brandontschaefer)]

yay

review: Approve

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2013-10-30 23:22:34 +0000
+++ Nux/WindowCompositor.cpp	2014-10-03 23:10:53 +0000
@@ -283,9 +283,8 @@
     }
     else if (event.type == NUX_DND_DROP)
     {
-      InputArea* current_dnd_area = GetDnDArea();
-      if (current_dnd_area->GetAbsoluteGeometry().IsPointInside(event.x - event.x_root, event.y - event.y_root))
-        current_dnd_area->HandleDndDrop(event);
+      if (_dnd_area && _dnd_area->GetAbsoluteGeometry().IsPointInside(event.x - event.x_root, event.y - event.y_root))
+        _dnd_area->HandleDndDrop(event);
     }
   }