Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed possible crash in GxsIdDetails

Browse Source
This commit is contained in:
Cyril Soler 2016-04-12 10:06:01 -04:00
parent d5ed84ec9d
commit cf746f160c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,8 +127,8 @@ void GxsIdDetails::connectObject_locked(QObject *object, bool doConnect)
/* Search Object in pending list */ /* Search Object in pending list */
if(mPendingData.find(object) != mPendingData.end()) if(mPendingData.find(object) == mPendingData.end()) // force disconnect when not in the list
return ; doConnect = false ;
if (doConnect) { if (doConnect) {
connect(object, SIGNAL(destroyed(QObject*)), this, SLOT(objectDestroyed(QObject*))); connect(object, SIGNAL(destroyed(QObject*)), this, SLOT(objectDestroyed(QObject*)));
@ -169,10 +169,10 @@ void GxsIdDetails::timerEvent(QTimerEvent *event)
pendingData.mCallback(GXS_ID_DETAILS_TYPE_DONE, details, pendingData.mObject, pendingData.mData); pendingData.mCallback(GXS_ID_DETAILS_TYPE_DONE, details, pendingData.mObject, pendingData.mData);
QObject *object = pendingData.mObject; QObject *object = pendingData.mObject;
mPendingDataIterator = mPendingData.erase(mPendingDataIterator);
connectObject_locked(object, false); connectObject_locked(object, false);
mPendingDataIterator = mPendingData.erase(mPendingDataIterator);
continue; continue;
} }
@ -182,10 +182,10 @@ void GxsIdDetails::timerEvent(QTimerEvent *event)
pendingData.mCallback(GXS_ID_DETAILS_TYPE_FAILED, details, pendingData.mObject, pendingData.mData); pendingData.mCallback(GXS_ID_DETAILS_TYPE_FAILED, details, pendingData.mObject, pendingData.mData);
QObject *object = pendingData.mObject; QObject *object = pendingData.mObject;
mPendingDataIterator = mPendingData.erase(mPendingDataIterator);
connectObject_locked(object, false); connectObject_locked(object, false);
mPendingDataIterator = mPendingData.erase(mPendingDataIterator);
continue; continue;
} }