From c12ec062a2f14a15d7f3caacbf791c2f2e395271 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Tue, 21 Sep 2010 17:32:31 +0000
Subject: [PATCH] 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
---
 libretroshare/src/services/p3chatservice.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libretroshare/src/services/p3chatservice.cc b/libretroshare/src/services/p3chatservice.cc
index ea37c61de..09fbd8a77 100644
--- a/libretroshare/src/services/p3chatservice.cc
+++ b/libretroshare/src/services/p3chatservice.cc
@@ -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 ;