diff options
| author | Luboš Doležel <lubos@dolezel.info> | 2020-02-23 09:37:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 09:37:47 +0100 |
| commit | cbd8359e70149d1f47385883498f5d98723e43f2 (patch) | |
| tree | 05bfd6875ca770350b618bdfbb4c119bed5abc52 /src | |
| parent | 772c590270683b2090bdbdf651c7032d4e9b5287 (diff) | |
| parent | 79cc23508006d61172522f4b12db8261e760768b (diff) | |
| download | twinkle-cbd8359e70149d1f47385883498f5d98723e43f2.tar twinkle-cbd8359e70149d1f47385883498f5d98723e43f2.tar.gz twinkle-cbd8359e70149d1f47385883498f5d98723e43f2.tar.lz twinkle-cbd8359e70149d1f47385883498f5d98723e43f2.tar.xz twinkle-cbd8359e70149d1f47385883498f5d98723e43f2.zip | |
Merge pull request #166 from fbriere/issue/165-deadlocks-simple
Simple fixes for two deadlocks
Diffstat (limited to 'src')
| -rw-r--r-- | src/phone.cpp | 2 | ||||
| -rw-r--r-- | src/phone.h | 2 |
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. |