Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-24 22:30:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix (by thunder) to avoid calling QPixmap outside the main thread, causing some avatars to fail to load

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7938 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-02-11 07:00:52 +00:00
parent 6c9dffaa40
commit 8b1d94fe3e
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -201,10 +201,14 @@ bool GxsIdDetails::process(const RsGxsId &id, GxsIdDetailsCallbackFunction callb
} }
/* Try to get the information */ /* Try to get the information */
if (rsIdentity && rsIdentity->getIdDetails(id, details)) { // the idea behind this was, to call the callback directly when the identity is already loaded in librs
callback(GXS_ID_DETAILS_TYPE_DONE, details, object, data); // without one timer tick, but it causes the use of Pixmap in avatars within a threat that is different than
return true; // the GUI thread, which is not allowed by Qt => some avatars fail to load.
}
// if (rsIdentity && rsIdentity->getIdDetails(id, details)) {
// callback(GXS_ID_DETAILS_TYPE_DONE, details, object, data);
// return true;
// }
details.mId = id; details.mId = id;