mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Added assert to catch dupe source.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-04-04 07:59:22 +02:00
parent b252418074
commit f78df2c087
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/network/controlconnection.cpp
View File

@@ -75,6 +75,13 @@ ControlConnection::setup()
{ {
qDebug() << Q_FUNC_INFO << id() << name(); qDebug() << Q_FUNC_INFO << id() << name();
if ( !m_source.isNull() )
{
qDebug() << "This source seems to be online already.";
Q_ASSERT( false );
return;
}
QString friendlyName; QString friendlyName;
if ( Servent::isIPWhitelisted( m_sock->peerAddress() ) ) if ( Servent::isIPWhitelisted( m_sock->peerAddress() ) )
{ {
@@ -85,7 +92,7 @@ ControlConnection::setup()
} }
else else
friendlyName = name(); friendlyName = name();
// setup source and remote collection for this peer // setup source and remote collection for this peer
m_source = SourceList::instance()->get( id(), friendlyName ); m_source = SourceList::instance()->get( id(), friendlyName );
m_source->setControlConnection( this ); m_source->setControlConnection( this );

6
src/libtomahawk/source.cpp
View File

@@ -30,7 +30,7 @@
using namespace Tomahawk; using namespace Tomahawk;
Source::Source( int id, const QString &username ) Source::Source( int id, const QString& username )
: QObject() : QObject()
, m_isLocal( false ) , m_isLocal( false )
, m_online( false ) , m_online( false )
@@ -38,7 +38,7 @@ Source::Source( int id, const QString &username )
, m_id( id ) , m_id( id )
, m_cc( 0 ) , m_cc( 0 )
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO << id << username;
if ( id == 0 ) if ( id == 0 )
{ {
@@ -146,6 +146,7 @@ Source::setOnline()
{ {
if ( m_online ) if ( m_online )
return; return;
m_online = true;
// ensure username is in the database // ensure username is in the database
DatabaseCommand_addSource* cmd = new DatabaseCommand_addSource( m_username, m_friendlyname ); DatabaseCommand_addSource* cmd = new DatabaseCommand_addSource( m_username, m_friendlyname );
@@ -153,7 +154,6 @@ Source::setOnline()
SLOT( dbLoaded( unsigned int, const QString& ) ) ); SLOT( dbLoaded( unsigned int, const QString& ) ) );
Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) ); Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
m_online = true;
emit online(); emit online();
} }