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

Fixed SIGSEGV fault, thx to Phenom for the Patch ( FixConfCertDialog_SIGSEGV_v0.6.patch )

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7263 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-04-11 11:47:46 +00:00
parent 9ea4ab24e0
commit d1e526cdf7
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View file

@ -118,19 +118,19 @@ ConfCertDialog::ConfCertDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidge
connect(this, SIGNAL(configChanged()), w->getPage(MainWindow::Network), SLOT(insertConnect())); connect(this, SIGNAL(configChanged()), w->getPage(MainWindow::Network), SLOT(insertConnect()));
} }
} }
ConfCertDialog::~ConfCertDialog() ConfCertDialog::~ConfCertDialog()
{ {
if(peerId.isNull()) // if(peerId.isNull())
{ {
QMap<RsPeerId, ConfCertDialog*>::iterator it = instances_ssl.find(peerId); QMap<RsPeerId, ConfCertDialog*>::iterator it = instances_ssl.find(peerId);
if (it != instances_ssl.end()) if (it != instances_ssl.end())
instances_ssl.erase(it); instances_ssl.erase(it);
} }
else // else
{ {
QMap<RsPgpId, ConfCertDialog*>::iterator it = instances_pgp.find(pgpId); QMap<RsPgpId, ConfCertDialog*>::iterator it = instances_pgp.find(pgpId);
if (it != instances_pgp.end()) if (it != instances_pgp.end())
instances_pgp.erase(it); instances_pgp.erase(it);
} }
} }
@ -155,14 +155,12 @@ void ConfCertDialog::loadAll()
} }
void ConfCertDialog::load() void ConfCertDialog::load()
{ {
RsPeerDetails detail; RsPeerDetails detail;
bool ok = false ; if(!(rsPeers->getPeerDetails(peerId, detail) || rsPeers->getGPGDetails(pgpId, detail)))
{
if(!(rsPeers->getPeerDetails(peerId, detail) || rsPeers->getGPGDetails(pgpId, detail))) QMessageBox::information(this,
{
QMessageBox::information(this,
tr("RetroShare"), tr("RetroShare"),
tr("Error : cannot get peer details.")); tr("Error : cannot get peer details."));
close(); close();