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 crash in IdEditDialog::updateId when no avater is set.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-01-29 16:09:32 +00:00
parent b7f4e292f1
commit 4cab5dc743
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -508,20 +508,20 @@ void IdEditDialog::updateId()
mEditGroup.mMeta.mGroupName = groupname; mEditGroup.mMeta.mGroupName = groupname;
const QPixmap *pixmap = ui.avatarLabel->pixmap(); const QPixmap *pixmap = ui.avatarLabel->pixmap();
if (!pixmap->isNull()) if (pixmap && !pixmap->isNull())
{ {
QByteArray ba; QByteArray ba;
QBuffer buffer(&ba); QBuffer buffer(&ba);
buffer.open(QIODevice::WriteOnly); buffer.open(QIODevice::WriteOnly);
pixmap->save(&buffer, "PNG"); // writes image into ba in PNG format pixmap->save(&buffer, "PNG"); // writes image into ba in PNG format
mEditGroup.mImage.copy((uint8_t *) ba.data(), ba.size()); mEditGroup.mImage.copy((uint8_t *) ba.data(), ba.size());
} }
else else
mEditGroup.mImage.clear(); mEditGroup.mImage.clear();
uint32_t dummyToken = 0; uint32_t dummyToken = 0;
rsIdentity->updateIdentity(dummyToken, mEditGroup); rsIdentity->updateIdentity(dummyToken, mEditGroup);
@ -551,4 +551,4 @@ void IdEditDialog::removeAvatar()
uint32_t dummyToken = 0; uint32_t dummyToken = 0;
rsIdentity->updateIdentity(dummyToken, mEditGroup); rsIdentity->updateIdentity(dummyToken, mEditGroup);
} }