Nux

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

Proposed by Marco Trevisan (Treviño) on 2014-10-03
Status: Merged
Approved by: Brandon Schaefer on 2014-10-03
Approved revision: 846
Merged at revision: 849
Proposed branch: lp:~3v1n0/nux/check-dnd_area-trusty
Merge into: lp:nux/trusty
Diff against target: 14 lines (+2/-3)
1 file modified
Nux/WindowCompositor.cpp (+2/-3)
To merge this branch: bzr merge lp:~3v1n0/nux/check-dnd_area-trusty
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2014-10-03 Approve on 2014-10-03
Review via email: mp+237153@code.launchpad.net

Commit message

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

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :

yay

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/WindowCompositor.cpp'
2--- Nux/WindowCompositor.cpp 2013-10-30 23:22:34 +0000
3+++ Nux/WindowCompositor.cpp 2014-10-03 23:10:53 +0000
4@@ -283,9 +283,8 @@
5 }
6 else if (event.type == NUX_DND_DROP)
7 {
8- InputArea* current_dnd_area = GetDnDArea();
9- if (current_dnd_area->GetAbsoluteGeometry().IsPointInside(event.x - event.x_root, event.y - event.y_root))
10- current_dnd_area->HandleDndDrop(event);
11+ if (_dnd_area && _dnd_area->GetAbsoluteGeometry().IsPointInside(event.x - event.x_root, event.y - event.y_root))
12+ _dnd_area->HandleDndDrop(event);
13 }
14 }
15

Subscribers

People subscribed via source and target branches