From ce2db3aefd81db4a4fb7a152afbe69d042ac953a Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 27 Feb 2011 20:33:01 +0100 Subject: [PATCH] * Fixed crash, hopefully. --- src/libtomahawk/network/controlconnection.cpp | 2 +- src/libtomahawk/network/servent.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/network/controlconnection.cpp b/src/libtomahawk/network/controlconnection.cpp index cb7fcb647..67e807f67 100644 --- a/src/libtomahawk/network/controlconnection.cpp +++ b/src/libtomahawk/network/controlconnection.cpp @@ -110,7 +110,7 @@ ControlConnection::setupDbSyncConnection( bool ondemand ) qDebug() << Q_FUNC_INFO << ondemand << m_source->id(); Q_ASSERT( m_source->id() > 0 ); - if( ! m_dbconnkey.isEmpty() ) + if( !m_dbconnkey.isEmpty() ) { qDebug() << "Connecting to DBSync offer from peer..."; m_dbsyncconn = new DBSyncConnection( m_servent, m_source ); diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp index a903bdd17..44525742b 100644 --- a/src/libtomahawk/network/servent.cpp +++ b/src/libtomahawk/network/servent.cpp @@ -609,7 +609,7 @@ Servent::remoteIODeviceFactory( const result_ptr& result ) const QString sourceName = parts.at( 0 ); const QString fileId = parts.at( 1 ); source_ptr s = SourceList::instance()->get( sourceName ); - if ( s.isNull() ) + if ( s.isNull() || !s->controlConnection() ) return sp; ControlConnection* cc = s->controlConnection();