summaryrefslogtreecommitdiff
path: root/src/lib/butler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/butler.cc')
-rw-r--r--src/lib/butler.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 595d98809..df2358086 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -101,6 +101,8 @@ Butler::Butler (
Butler::~Butler ()
{
+ boost::this_thread::disable_interruption dis;
+
{
boost::mutex::scoped_lock lm (_mutex);
_stop_thread = true;
@@ -113,9 +115,7 @@ Butler::~Butler ()
_thread.interrupt ();
try {
_thread.join ();
- } catch (...) {
-
- }
+ } catch (...) {}
}
/** Caller must hold a lock on _mutex */