summaryrefslogtreecommitdiff
path: root/Source/WebCore/fileapi/FileReader.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-09-10 19:10:20 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-09-10 19:10:20 +0200
commit284837daa07b29d6a63a748544a90b1f5842ac5c (patch)
treeecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/WebCore/fileapi/FileReader.cpp
parent2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff)
downloadqtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/WebCore/fileapi/FileReader.cpp')
-rw-r--r--Source/WebCore/fileapi/FileReader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/fileapi/FileReader.cpp b/Source/WebCore/fileapi/FileReader.cpp
index 0f245c211..2476859fb 100644
--- a/Source/WebCore/fileapi/FileReader.cpp
+++ b/Source/WebCore/fileapi/FileReader.cpp
@@ -161,7 +161,7 @@ void FileReader::abort()
{
LOG(FileAPI, "FileReader: aborting\n");
- if (m_aborting)
+ if (m_aborting || m_state != LOADING)
return;
m_aborting = true;