[haiku-commits] haiku: hrev43618 - src/kits/tracker

  • From: stpere@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 5 Jan 2012 00:14:24 +0100 (CET)

hrev43618 adds 1 changeset to branch 'master'
old head: fcfd687380b9c07019fd51b6894f4c96288ccb0c
new head: d390c065518bfd467544eb5e4c699258c616287a

----------------------------------------------------------------------------

d390c06: PoseView: Fix assertion in InitDirentIterator
  
  The dynamic_cast was called twice, and the assert was
  done on the first attempt. Now it just cast once, assert on this
  and pass it further as before.
  
  CID 3122.

                                [ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev43618
Commit:      d390c065518bfd467544eb5e4c699258c616287a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=d390c06
Author:      Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date:        Wed Jan  4 23:11:12 2012 UTC

----------------------------------------------------------------------------

1 files changed, 4 insertions(+), 3 deletions(-)
src/kits/tracker/PoseView.cpp |    7 ++++---

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index d5f6543..bd4d113 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -1063,10 +1063,11 @@ BPoseView::InitDirentIterator(const entry_ref *ref)
 
        ASSERT(!sourceModel.IsQuery());
        ASSERT(sourceModel.Node());
-       ASSERT(dynamic_cast<BDirectory *>(sourceModel.Node()));
 
-       EntryListBase *result = new CachedDirectoryEntryList(
-               *dynamic_cast<BDirectory *>(sourceModel.Node()));
+       BDirectory *directory = dynamic_cast<BDirectory *>(sourceModel.Node());
+       ASSERT(directory);
+
+       EntryListBase *result = new CachedDirectoryEntryList(*directory);
 
        if (result->Rewind() != B_OK) {
                delete result;


Other related posts:

  • » [haiku-commits] haiku: hrev43618 - src/kits/tracker - stpere