Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 23:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed deadlock in FriendSelectionWidget (patch from Cyril)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-06-18 09:58:47 +00:00
parent b21fae52d0
commit e6c0217801
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
View file

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