summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/phone.cpp2
-rw-r--r--src/phone.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/phone.cpp b/src/phone.cpp
index 66d6ea0..1634de3 100644
--- a/src/phone.cpp
+++ b/src/phone.cpp
@@ -279,8 +279,6 @@ void t_phone::end_call(void) {
move_line_to_background(lineno1);
move_line_to_background(lineno2);
} else {
- t_rwmutex_reader x(lines_mtx);
-
// Hangup the active line, and make the next
// line active.
int l = active_line;
diff --git a/src/phone.h b/src/phone.h
index f9c18d8..771db3b 100644
--- a/src/phone.h
+++ b/src/phone.h
@@ -130,7 +130,7 @@ private:
bool is_3way; // indicates an acitive 3-way
t_line *line1_3way; // first line in 3-way conf
t_line *line2_3way; // second line in 3-way conf
- mutable t_mutex mutex_3way;
+ mutable t_recursive_mutex mutex_3way;
// Call transfer data. When a REFER comes in, the user has
// to give permission before the triggered INVITE can be sent.