From e6c02178015aed0770ac58cdb6d6fef3ad7190d6 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Tue, 18 Jun 2013 09:58:47 +0000
Subject: [PATCH] Fixed deadlock in FriendSelectionWidget (patch from Cyril)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/common/FriendSelectionWidget.cpp           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
index c10dbdd58..b69cca089 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
@@ -23,6 +23,7 @@
 #include <QDialogButtonBox>
 #include "FriendSelectionWidget.h"
 #include "ui_FriendSelectionWidget.h"
+#include <retroshare-gui/RsAutoUpdatePage.h>
 #include "gui/notifyqt.h"
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/common/StatusDefs.h"
@@ -219,6 +220,10 @@ void FriendSelectionWidget::fillList()
 	if (!mStarted) {
 		return;
 	}
+	if(!isVisible())
+		return ;
+	if(RsAutoUpdatePage::eventsLocked())
+		return ;
 
 	mInFillList = true;
 
@@ -481,6 +486,11 @@ void FriendSelectionWidget::fillList()
 
 void FriendSelectionWidget::peerStatusChanged(const QString& peerId, int status)
 {
+	if(!isVisible())
+		return ;
+	if(RsAutoUpdatePage::eventsLocked())
+		return ;
+
 	QString gpgId;
 	int gpgStatus = RS_STATUS_OFFLINE;