[haiku-commits] haiku: hrev47558 - src/kits/tracker
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 23 Jul 2014 19:20:41 +0200 (CEST)
hrev47558 adds 1 changeset to branch 'master'
old head: d1a5f9098111929d00d31506c2d45bd1b3689f9e
new head: 3188d3d0bfea70a9218c7cc700c4bd3a4c211f4d
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=3188d3d+%5Ed1a5f90
----------------------------------------------------------------------------
3188d3d: Tracker: Remove logically dead code
Replace with an ASSERT that srcWindow != NULL by the time we've gotten
this far.
CID 1228649 and CID 1228650
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47558
Commit: 3188d3d0bfea70a9218c7cc700c4bd3a4c211f4d
URL: http://cgit.haiku-os.org/haiku/commit/?id=3188d3d
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Wed Jul 23 17:19:53 2014 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 5 deletions(-)
src/kits/tracker/PoseView.cpp | 7 ++-----
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 16ed536..5920fee 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -4156,7 +4156,6 @@ BPoseView::CanHandleDragSelection(const Model* target,
BContainerWindow* srcWindow;
status_t result = dragMessage->FindPointer("src_window",
(void**)&srcWindow);
-
if (result != B_OK || srcWindow == NULL) {
// handle a foreign drag
bool canCopy;
@@ -4198,8 +4197,7 @@ BPoseView::CanHandleDragSelection(const Model* target,
return false;
}
- if (result != B_OK)
- return false;
+ ASSERT(srcWindow != NULL);
AutoLock<BWindow> lock(srcWindow);
if (!lock)
@@ -4785,8 +4783,7 @@ BPoseView::HandleDropCommon(BMessage* message, Model*
targetModel,
return false;
}
- if (result != B_OK)
- return false;
+ ASSERT(srcWindow != NULL);
if (srcWindow == containerWindow) {
// drag started in this window
Other related posts:
- » [haiku-commits] haiku: hrev47558 - src/kits/tracker - jscipione
