diff options
| author | rebecca “wiggles” turner <rbt@sent.as> | 2024-10-05 17:33:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-10-05 17:33:00 +0000 |
| commit | 86b213e6321540328fb11c3ea99c0b24becc45b0 (patch) | |
| tree | d110b44daad528a73e4a75ad69f149ea6b7d51ad /src/libutil/thread-pool.cc | |
| parent | a3dd07535c183433a3f1f97596e9d2b41f8a33ba (diff) | |
| parent | ee0c195eba7d16b796fd9883e3fe88c0d64ff0bf (diff) | |
Merge "Split ignoreException to avoid suppressing CTRL-C" into main
Diffstat (limited to 'src/libutil/thread-pool.cc')
| -rw-r--r-- | src/libutil/thread-pool.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc index 0ff83e997..cd380b608 100644 --- a/src/libutil/thread-pool.cc +++ b/src/libutil/thread-pool.cc @@ -109,9 +109,8 @@ void ThreadPool::doWork(bool mainThread) try { std::rethrow_exception(exc); } catch (std::exception & e) { - if (!dynamic_cast<Interrupted*>(&e) && - !dynamic_cast<ThreadPoolShutDown*>(&e)) - ignoreException(); + if (!dynamic_cast<ThreadPoolShutDown*>(&e)) + ignoreExceptionExceptInterrupt(); } catch (...) { } } |