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

Added one more check of RsAutoUpdatePage::eventsLocked to GxsIdDetails::process

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-03-16 12:57:12 +00:00
parent 67c5ef9c8a
commit a967405c84
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
View file

@ -207,7 +207,7 @@ bool GxsIdDetails::process(const RsGxsId &id, GxsIdDetailsCallbackFunction callb
// the GUI thread, which is not allowed by Qt => some avatars fail to load. // the GUI thread, which is not allowed by Qt => some avatars fail to load.
bool isGuiThread = (QThread::currentThread() == qApp->thread()); bool isGuiThread = (QThread::currentThread() == qApp->thread());
if (isGuiThread && rsIdentity && rsIdentity->getIdDetails(id, details)) { if (isGuiThread && !RsAutoUpdatePage::eventsLocked() && rsIdentity && rsIdentity->getIdDetails(id, details)) {
callback(GXS_ID_DETAILS_TYPE_DONE, details, object, data); callback(GXS_ID_DETAILS_TYPE_DONE, details, object, data);
return true; return true;
} }