From d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 11 Jan 2012 10:03:25 +0100
Subject: Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3
 (http://svn.webkit.org/repository/webkit/trunk@104681)

---
 Source/WebCore/page/DragController.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Source/WebCore/page/DragController.cpp')

diff --git a/Source/WebCore/page/DragController.cpp b/Source/WebCore/page/DragController.cpp
index 79425629b..5d834df84 100644
--- a/Source/WebCore/page/DragController.cpp
+++ b/Source/WebCore/page/DragController.cpp
@@ -626,6 +626,7 @@ Node* DragController::draggableNode(const Frame* src, Node* startNode, const Int
             if (dragMode == DRAG_AUTO) {
                 if ((m_dragSourceAction & DragSourceActionImage)
                     && node->hasTagName(HTMLNames::imgTag)
+                    && src->settings()
                     && src->settings()->loadsImagesAutomatically()) {
                     state.m_dragType = static_cast<DragSourceAction>(state.m_dragType | DragSourceActionImage);
                     return node;
-- 
cgit v1.2.1