Reviewed by eseidel.

        Don't crash if no IconDatabase is available (ie. on Qt/Gdk)

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16507 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a6e30407039224ab350defa4d2385b3f0b5866de..055dc1c61ce3c4aa4788f8294aafb362eb703c1f 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-21  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by eseidel.
+
+        Don't crash if no IconDatabase is available (ie. on Qt/Gdk)
+
+        * page/Frame.cpp:
+        (WebCore::Frame::endIfNotLoading):
+
 2006-09-21  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by eseidel.

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 7b4cc35fba535c765c5ff2e2a881e8e6471c9953..f493441055c4941d3c1e5c00f0c6c308f2eb5c51 100644 (file)
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -767,7 +767,7 @@ void Frame::endIfNotLoading()
         
     
     if (IconDatabase* sharedIconDatabase = IconDatabase::sharedIconDatabase()) {
-        if (!sharedIconDatabase->enabled())
+        if (!sharedIconDatabase->enabled() || !sharedIconDatabase->enabled())
             return;
         
         String url(iconURL().url());