[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.1/kdebase/apps/dolphin/src
From:       Peter Penz <peter.penz () gmx ! at>
Date:       2008-10-15 18:02:47
Message-ID: 1224093767.774382.3874.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 871813 by ppenz:

Workaround for a crash when converting valid QPixmaps having a huge width to a QIcon \
(-> QIcon::isNull() will return true). I did not have the time for a more detailed \
analyzes, but this issue does not occur on trunk with a recent Qt/KDE version; so no \
forward port to trunk is done.

BUG: 170547

 M  +4 -1      iconmanager.cpp  


--- branches/KDE/4.1/kdebase/apps/dolphin/src/iconmanager.cpp #871812:871813
@@ -314,7 +314,10 @@
 
             const QModelIndex idx = m_dolphinModel->indexForUrl(preview.url);
             if (idx.isValid() && (idx.column() == 0)) {
-                m_dolphinModel->setData(idx, QIcon(preview.pixmap), \
Qt::DecorationRole); +                const QIcon icon(preview.pixmap);
+                if (!icon.isNull()) {
+                    m_dolphinModel->setData(idx, icon, Qt::DecorationRole);
+                }
             }
 
             m_previews.pop_front();


[prev in list] [next in list] [prev in thread] [next in thread]