removed problematic (and irrelevant) timer in PeerItem

Author: csoler

retroshare-gui/src/gui/feeds/PeerItem.cpp

@@ -65,7 +65,7 @@ PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, const RsPeerId &peerId,
         {
             auto fe = dynamic_cast<const RsFriendListEvent*>(e.get());
 
-            if(!fe)
+            if(!fe || fe->mSslId != mPeerId)
                 return;
 
             updateItem();
@@ -173,78 +173,62 @@ void PeerItem::updateItemStatic()
 
 void PeerItem::updateItem()
 {
-	if (!rsPeers)
-		return;
+    if (!rsPeers)
+        return;
 
-	/* fill in */
+    /* fill in */
 #ifdef DEBUG_ITEM
-	std::cerr << "PeerItem::updateItem()";
-	std::cerr << std::endl;
+    std::cerr << "PeerItem::updateItem()";
+    std::cerr << std::endl;
 #endif
-	if(!RsAutoUpdatePage::eventsLocked()) {
-		RsPeerDetails details;
-		if (!rsPeers->getPeerDetails(mPeerId, details))
-		{
-			chatButton->setEnabled(false);
-			sendmsgButton->setEnabled(false);
-
-			return;
-		}
+    RsPeerDetails details;
+    if (!rsPeers->getPeerDetails(mPeerId, details))
+    {
+        chatButton->setEnabled(false);
+        sendmsgButton->setEnabled(false);
 
-		/* top Level info */
-		QString status = StatusDefs::peerStateString(details.state);
+        return;
+    }
 
-#if 0
-		/* Append additional status info from status service */
-		StatusInfo statusInfo;
-		if ((rsStatus) && (rsStatus->getStatus(*it, statusInfo)))
-		{
-			status.append(QString::fromStdString("/" + RsStatusString(statusInfo.status)));
-		}
-#endif
-		statusLabel->setText(status);
-		trustLabel->setText(QString::fromStdString(RsPeerTrustString(details.trustLvl)));
+    /* top Level info */
+    QString status = StatusDefs::peerStateString(details.state);
 
-        QString ip_string;
+    statusLabel->setText(status);
+    trustLabel->setText(QString::fromStdString(RsPeerTrustString(details.trustLvl)));
 
-        if(details.localPort != 0)
-            ip_string += QString("%1:%2").arg(QString::fromStdString(details.localAddr)).arg(details.localPort);
+    QString ip_string;
 
-        if(details.extPort != 0)
-        {
-            if(!ip_string.isNull())
-                ip_string += "/" ;
+    if(details.localPort != 0)
+        ip_string += QString("%1:%2").arg(QString::fromStdString(details.localAddr)).arg(details.localPort);
 
-            ip_string += ip_string += QString("%1:%2").arg(QString::fromStdString(details.extAddr)).arg(details.extPort);
-        }
-		ipLabel->setText(ip_string);
+    if(details.extPort != 0)
+    {
+        if(!ip_string.isNull())
+            ip_string += "/" ;
 
-		connLabel->setText(StatusDefs::connectStateString(details));
+        ip_string += ip_string += QString("%1:%2").arg(QString::fromStdString(details.extAddr)).arg(details.extPort);
+    }
+    ipLabel->setText(ip_string);
 
-		/* do buttons */
-		chatButton->setEnabled(details.state & RS_PEER_STATE_CONNECTED);
-		if (details.state & RS_PEER_STATE_CONNECTED)
-		{
-			sendmsgButton->setEnabled(true);
-		}
-		else
-		{
-			sendmsgButton->setEnabled(false);
-		}
+    connLabel->setText(StatusDefs::connectStateString(details));
 
-		if (rsRtt)
-		{
-			double offset = rsRtt->getMeanOffset(RsPeerId(mPeerId));
-			offsetLabel->setText(QString::number(offset,'f',2).append(" s"));
-		}
+    /* do buttons */
+    chatButton->setEnabled(details.state & RS_PEER_STATE_CONNECTED);
 
-	}
+    if (details.state & RS_PEER_STATE_CONNECTED)
+    {
+        sendmsgButton->setEnabled(true);
+    }
+    else
+    {
+        sendmsgButton->setEnabled(false);
+    }
 
-	/* slow Tick  */
-	int msec_rate = 10129;
-	
-	QTimer::singleShot( msec_rate, this, SLOT(updateItem() ));
-	return;
+    if (rsRtt)
+    {
+        double offset = rsRtt->getMeanOffset(RsPeerId(mPeerId));
+        offsetLabel->setText(QString::number(offset,'f',2).append(" s"));
+    }
 }
 
 void PeerItem::toggle()