mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 03:10:12 +02:00
Code Issues Releases Wiki Activity

* Fixed crash in DbSyncConnection.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-01-09 07:42:31 +01:00
parent 3061a95cb1
commit 3eeec206f1
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -95,7 +95,7 @@ To build the app:
----------------- -----------------
$ mkdir build && cd build $ mkdir build && cd build
Pick one of the following two choices. If unsure pick the second one, you probably want a GUI. Pick one of the following two choices. If uncertain pick the second one, you probably want a GUI.
$ cmake -Dgui=no .. # enables headless mode, build without GUI $ cmake -Dgui=no .. # enables headless mode, build without GUI
$ cmake .. # normal build including GUI $ cmake .. # normal build including GUI

2
src/libtomahawk/database/databasecommand.cpp
View File

@@ -93,7 +93,7 @@ DatabaseCommand::factory( const QVariant& op, const source_ptr& source )
return cmd; return cmd;
} }
qDebug() << "ERRROR in" << Q_FUNC_INFO << name; qDebug() << "ERROR in" << Q_FUNC_INFO << name;
// Q_ASSERT( false ); // Q_ASSERT( false );
return NULL; return NULL;
} }

2
src/libtomahawk/network/dbsyncconnection.cpp
View File

@@ -204,7 +204,7 @@ DBSyncConnection::handleMsg( msg_ptr msg )
DatabaseCommand *cmd = DatabaseCommand::factory( m, m_source ); DatabaseCommand *cmd = DatabaseCommand::factory( m, m_source );
if ( !cmd ) if ( !cmd )
{ {
qDebug() << "UNKNOWN DBOP CMD" << cmd->commandname() << cmd->guid(); qDebug() << "UNKNOWN DBOP CMD";
if( !msg->is( Msg::FRAGMENT ) ) // last msg in this batch if( !msg->is( Msg::FRAGMENT ) ) // last msg in this batch
lastOpApplied(); lastOpApplied();

2
src/libtomahawk/network/servent.cpp
View File

@@ -100,7 +100,7 @@ Servent::startListening( QHostAddress ha, bool upnp, int port )
// last.fm office firewall policy hack // last.fm office firewall policy hack
// (corp. firewall allows outgoing connections to this port, // (corp. firewall allows outgoing connections to this port,
// so listen on this if you want lastfmers to connect to you) // so listen on this if you want lastfmers to connect to you)
if( qApp->arguments().contains("--porthack") ) if( qApp->arguments().contains( "--porthack" ) )
{ {
tryport = 3389; tryport = 3389;
pf->remove( tryport ); pf->remove( tryport );

2
src/libtomahawk/network/servent.h
View File

@@ -91,7 +91,7 @@ public:
void reverseOfferRequest( ControlConnection* orig_conn, const QString& key, const QString& theirkey ); void reverseOfferRequest( ControlConnection* orig_conn, const QString& key, const QString& theirkey );
void setExternalAddress( QHostAddress ha, int port ); void setExternalAddress( QHostAddress ha, int port );
bool visibleExternally() const { return m_externalPort > 0; } bool visibleExternally() const { return m_externalPort > 0 && !m_externalAddress.isNull(); }
QHostAddress externalAddress() const { return m_externalAddress; } QHostAddress externalAddress() const { return m_externalAddress; }
int externalPort() const { return m_externalPort; } int externalPort() const { return m_externalPort; }