diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-04 06:17:13 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-04 06:17:13 (GMT) |
| commit | 723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b (patch) | |
| tree | 4ddef15ac99c9a4babd23986c4f93eaa2009e512 /src/script/api/qscriptengine.cpp | |
| parent | c86449e2e45b67662b652d58e95e0ca7c99782fd (diff) | |
| parent | 9d0317c91dbbe660af2ed2aa8ea47446049467d2 (diff) | |
| download | Qt-723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b.zip Qt-723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b.tar.gz Qt-723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b.tar.bz2 | |
Merge branch '4.7' into mimir
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 07aced4..128e9c3 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -46,6 +46,7 @@ #include "Error.h" #include "Interpreter.h" +#include "ExceptionHelpers.h" #include "PrototypeFunction.h" #include "InitializeThreading.h" #include "ObjectPrototype.h" @@ -4116,9 +4117,11 @@ bool QScriptEngine::isEvaluating() const void QScriptEngine::abortEvaluation(const QScriptValue &result) { Q_D(QScriptEngine); - - d->timeoutChecker()->setShouldAbort(true); + if (!isEvaluating()) + return; d->abortResult = result; + d->timeoutChecker()->setShouldAbort(true); + JSC::throwError(d->currentFrame, JSC::createInterruptedExecutionException(&d->currentFrame->globalData()).toObject(d->currentFrame)); } #ifndef QT_NO_QOBJECT |