mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-26 09:41:29 -05:00
Fixed deadlock in saving chat messages with an own avatar.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3520 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
ad9f981ab0
commit
c12ec062a2
@ -955,8 +955,6 @@ std::list<RsItem*> p3ChatService::saveList(bool& cleanup)
|
||||
{
|
||||
cleanup = true;
|
||||
|
||||
mChatMtx.lock(); /****** MUTEX LOCKED *******/
|
||||
|
||||
/* now we create a pqistore, and stream all the msgs into it */
|
||||
|
||||
std::list<RsItem*> list ;
|
||||
@ -969,6 +967,8 @@ std::list<RsItem*> p3ChatService::saveList(bool& cleanup)
|
||||
list.push_back(ci) ;
|
||||
}
|
||||
|
||||
mChatMtx.lock(); /****** MUTEX LOCKED *******/
|
||||
|
||||
RsChatStatusItem *di = new RsChatStatusItem ;
|
||||
di->status_string = _custom_status_string ;
|
||||
di->flags = RS_CHAT_FLAG_CUSTOM_STATE ;
|
||||
|
Loading…
x
Reference in New Issue
Block a user