From c9de25a4c6ebc40e56b70057cfe1d7f8cfab925c Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sun, 13 Feb 2011 15:49:09 -0500 Subject: [PATCH] Remember values instead of forgetting some --- src/sip/twitter/twitter.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/sip/twitter/twitter.cpp b/src/sip/twitter/twitter.cpp index dc6b5b90e..ec56b855b 100644 --- a/src/sip/twitter/twitter.cpp +++ b/src/sip/twitter/twitter.cpp @@ -163,6 +163,7 @@ TwitterPlugin::checkTimerFired() void TwitterPlugin::connectTimerFired() { + qDebug() << Q_FUNC_INFO; if ( !isValid() || m_cachedPeers.isEmpty() ) return; @@ -174,7 +175,10 @@ TwitterPlugin::connectTimerFired() QHash< QString, QVariant > peerData = m_cachedPeers[screenName].toHash(); if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) ) + { + qDebug() << "TwitterPlugin does not have host, port and/or pkey values for " << screenName; continue; + } QMetaObject::invokeMethod( this, "registerOffer", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&peerData ) ); } @@ -450,7 +454,6 @@ TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, Q qDebug() << "TwitterPlugin needs to send and has node"; _peerData["ohst"] = QVariant::fromValue< QString >( Servent::instance()->externalAddress() ); _peerData["oprt"] = QVariant::fromValue< int >( Servent::instance()->externalPort() ); - m_cachedPeers[screenName] = QVariant::fromValue< QHash< QString, QVariant > >( _peerData ); peersChanged = true; if( !Servent::instance()->externalAddress().isEmpty() && !Servent::instance()->externalPort() == 0 ) QMetaObject::invokeMethod( this, "sendOffer", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&_peerData ) ); @@ -462,7 +465,10 @@ TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, Q QMetaObject::invokeMethod( this, "makeConnection", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&_peerData ) ); if ( peersChanged ) + { + m_cachedPeers[screenName] = QVariant::fromValue< QHash< QString, QVariant > >( _peerData ); TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers ); + } } void