ardour/livetrax
13
0
Fork 0
Code

fix potential invalid lock

Browse Source
This commit is contained in:
Robin Gareus 2016-12-14 17:31:31 +01:00
parent 7a1ff7ce8f
commit 036390f4c2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/pbd/pbd/abstract_ui.cc
View File

@ -239,15 +239,14 @@ AbstractUI<RequestObject>::handle_ui_requests ()
rbml.acquire (); rbml.acquire ();
if (vec.buf[0]->invalidation) { if (vec.buf[0]->invalidation) {
DEBUG_TRACE (PBD::DEBUG::AbstractUI, string_compose ("%1: removing invalidation record for that request\n", event_loop_name())); DEBUG_TRACE (PBD::DEBUG::AbstractUI, string_compose ("%1: removing invalidation record for that request\n", event_loop_name()));
Glib::Threads::Mutex::Lock li (vec.buf[0]->invalidation->event_loop->slot_invalidation_mutex(), Glib::Threads::NOT_LOCK);
if (vec.buf[0]->invalidation->event_loop && vec.buf[0]->invalidation->event_loop != this) { if (vec.buf[0]->invalidation->event_loop && vec.buf[0]->invalidation->event_loop != this) {
li.acquire (); vec.buf[0]->invalidation->event_loop->slot_invalidation_mutex().lock ();
} }
//if (!(*i).second->dead) { //if (!(*i).second->dead) {
vec.buf[0]->invalidation->requests.remove (vec.buf[0]); vec.buf[0]->invalidation->requests.remove (vec.buf[0]);
//} //}
if (vec.buf[0]->invalidation->event_loop && vec.buf[0]->invalidation->event_loop != this) { if (vec.buf[0]->invalidation->event_loop && vec.buf[0]->invalidation->event_loop != this) {
li.release (); vec.buf[0]->invalidation->event_loop->slot_invalidation_mutex().unlock ();
} }
} else { } else {
DEBUG_TRACE (PBD::DEBUG::AbstractUI, string_compose ("%1: no invalidation record for that request\n", event_loop_name())); DEBUG_TRACE (PBD::DEBUG::AbstractUI, string_compose ("%1: no invalidation record for that request\n", event_loop_name()));