Unified Diff: src/Thread.cpp
Issue 29361562:
Issue 3594 - remove circular references JsEngine-JsValue-JsEngine (Closed)
Patch Set: temporary workaround for race condition
Created Dec. 1, 2016, 10:26 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« src/JsValue.cpp ('K')
|
« src/Notification.cpp ('k')
|
src/Utils.h » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/Thread.cpp |
| diff --git a/src/Thread.cpp b/src/Thread.cpp |
| index 91bfe61fdf727b428f63b9d413bc9bef130a6d39..ff39b6b0b38d1b19dabf9d8b35da4eaca09f8a7a 100644 |
| --- a/src/Thread.cpp |
| +++ b/src/Thread.cpp |
| @@ -20,6 +20,7 @@ |
| #endif |
| #include "Thread.h" |
| +#include <AdblockPlus/JsEngine.h> |
| using namespace AdblockPlus; |
| @@ -107,7 +108,13 @@ void Thread::Join() |
| void Thread::CallRun(Thread* thread) |
| { |
| - thread->Run(); |
| + try |
| + { |
| + thread->Run(); |
| + } |
| + catch (const AdblockPlus::JsEngine::JsEngineNotAvailableException&) |
| + { |
| + } |
| if (thread->m_deleteSelfOnFinish) |
| delete thread; |
| } |
« src/JsValue.cpp ('K')
|
« src/Notification.cpp ('k')
|
src/Utils.h » ('j')
|
no next file with comments »
