Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 09:41:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed deadlock in saving chat messages with an own avatar.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3520 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-21 17:32:31 +00:00
parent ad9f981ab0
commit c12ec062a2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/services/p3chatservice.cc
View File

@ -955,8 +955,6 @@ std::list<RsItem*> p3ChatService::saveList(bool& cleanup)
{ {
cleanup = true; cleanup = true;
mChatMtx.lock(); /****** MUTEX LOCKED *******/
/* now we create a pqistore, and stream all the msgs into it */ /* now we create a pqistore, and stream all the msgs into it */
std::list<RsItem*> list ; std::list<RsItem*> list ;
@ -969,6 +967,8 @@ std::list<RsItem*> p3ChatService::saveList(bool& cleanup)
list.push_back(ci) ; list.push_back(ci) ;
} }
mChatMtx.lock(); /****** MUTEX LOCKED *******/
RsChatStatusItem *di = new RsChatStatusItem ; RsChatStatusItem *di = new RsChatStatusItem ;
di->status_string = _custom_status_string ; di->status_string = _custom_status_string ;
di->flags = RS_CHAT_FLAG_CUSTOM_STATE ; di->flags = RS_CHAT_FLAG_CUSTOM_STATE ;