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

  • From: Stephan Aßmus <superstippi@xxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 27 Aug 2019 02:55:50 -0400 (EDT)

hrev53409 adds 1 changeset to branch 'master'
old head: b9d9c282fd135d57db47a12c0a44fe0d6d5a6beb
new head: ab56137e2411f03672cd5a65875a82ade5dd19b0
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=ab56137e2411+%5Eb9d9c282fd13

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

ab56137e2411: IconCache: remove incorrect ASSERT()
  
  The code does just fine both if entry is NULL and if it doesn't have an
  icon. However, if entry is NULL, this assert calls a method on it, which
  is a bad idea.
  
  Change-Id: I80b314db373970d99eb008aeaec6254d14c39ca7
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/1749
  Reviewed-by: Stephan Aßmus <superstippi@xxxxxx>

                             [ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]

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

Revision:    hrev53409
Commit:      ab56137e2411f03672cd5a65875a82ade5dd19b0
URL:         https://git.haiku-os.org/haiku/commit/?id=ab56137e2411
Author:      Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date:        Mon Aug 26 19:32:57 2019 UTC
Committer:   Stephan Aßmus <superstippi@xxxxxx>
Commit-Date: Tue Aug 27 06:55:47 2019 UTC

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

1 file changed, 1 deletion(-)
src/kits/tracker/IconCache.cpp | 1 -

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

diff --git a/src/kits/tracker/IconCache.cpp b/src/kits/tracker/IconCache.cpp
index 1812a3ea84..26d9d0bbc8 100644
--- a/src/kits/tracker/IconCache.cpp
+++ b/src/kits/tracker/IconCache.cpp
@@ -1007,7 +1007,6 @@ IconCache::Preload(AutoLock<SimpleIconCache>* 
nodeCacheLocker,
 
                                        entry = 
GetIconFromFileTypes(&modelOpener, source, mode,
                                                size, &lazyBitmap, 0);
-                                       ASSERT(entry != NULL || 
entry->HaveIconBitmap(mode, size));
 
                                        if (entry == NULL || 
!entry->HaveIconBitmap(mode, size)) {
                                                // we don't have an icon, go 
with the generic


Other related posts:

  • » [haiku-commits] haiku: hrev53409 - src/kits/tracker - Stephan Aßmus