From 06e4c6806582f47ca2b74eb4e9bd4af0e526d62a Mon Sep 17 00:00:00 2001 From: RetroPooh Date: Fri, 10 Mar 2017 11:15:39 +0300 Subject: [PATCH] upd --- libretroshare/src/turtle/p3turtle.cc | 4 ++-- retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/turtle/p3turtle.cc b/libretroshare/src/turtle/p3turtle.cc index 53e3bf9d8..371651865 100644 --- a/libretroshare/src/turtle/p3turtle.cc +++ b/libretroshare/src/turtle/p3turtle.cc @@ -2003,12 +2003,12 @@ void p3turtle::getTrafficStatistics(TurtleTrafficStatisticsInfo& info) const std::string p3turtle::getPeerNameForVirtualPeerId(const RsPeerId& virtual_peer_id) { + RsStackMutex stack(mTurtleMtx); /********** STACK LOCKED MTX ******/ std::string name = "unknown"; std::map::const_iterator it(_virtual_peers.find(virtual_peer_id)) ; if(it != _virtual_peers.end()) { - TurtleTunnelId tunnel_id = it->second ; - std::map::iterator it2( _local_tunnels.find(tunnel_id) ) ; + std::map::iterator it2( _local_tunnels.find(it->second) ) ; if(it2 != _local_tunnels.end()) { if(it2->second.local_src == _own_id) diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp index 60d42af3f..17df9d2fc 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp @@ -1392,9 +1392,9 @@ QString TransfersDialog::getPeerName(const RsPeerId& id) const { res = QString::fromStdString(rsTurtle->getPeerNameForVirtualPeerId(id)); if(rsFiles->isEncryptedSource(id)) - return tr("e2ee tunnel ")+QString::fromStdString(id.toStdString()).left(8) + " via " +res ; + return tr("Anonymous E2EE tunnel ")+QString::fromStdString(id.toStdString()).left(8) + " via " +res ; else - return tr("Anon tunnel ")+QString::fromStdString(id.toStdString()).left(8) + " via " +res ; + return tr("Anonymous tunnel id # ")+QString::fromStdString(id.toStdString()).left(8) + " via " +res ; } else return res ;