[Merge] lp:~phablet-team/media-hub/fix-1457129 into lp:media-hub

[Jim Hodapp]

Jim Hodapp has proposed merging lp:~phablet-team/media-hub/fix-1457129 into lp:media-hub.

Commit message:
Use try_lock() instead of a lock_guard to fail gracefully from rare deadlock situations.

Requested reviews:
  Ubuntu Phablet Team (phablet-team)
Related bugs:
  Bug #1457129 in media-hub (Ubuntu): "All sound stops playing after receiving SMS messages"
  https://bugs.launchpad.net/ubuntu/+source/media-hub/+bug/1457129

For more details, see:
https://code.launchpad.net/~phablet-team/media-hub/fix-1457129/+merge/260343

Use try_lock() instead of a lock_guard to fail gracefully from rare deadlock situations.
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/media-hub/fix-1457129 into lp:media-hub.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 5311 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150527/f6fc8586/attachment.diff>