CVS commit by trueg: BACKPORT: fixed a rare crash in cddb M +10 -4 k3bcddb.cpp 1.13.2.3 M +2 -1 k3bcddb.h 1.6.2.1 --- kdeextragear-1/k3b/src/cddb/k3bcddb.cpp #1.13.2.2:1.13.2.3 @@ -110,16 +110,22 @@ void K3bCddb::query( const K3bToc& toc ) if( m_bLocalCddbQuery ) { m_iCurrentQueriedLocalDir = 0; - localQuery(); + QTimer::singleShot( 0, this, SLOT(localQuery()) ); } else if( m_bRemoteCddbQuery ) { m_iCurrentQueriedServer = 0; - remoteQuery(); + QTimer::singleShot( 0, this, SLOT(remoteQuery()) ); } else { - emit queryFinished( K3bCddbQuery::NO_ENTRY_FOUND ); + QTimer::singleShot( 0, this, SLOT(slotNoEntry()) ); } } +void K3bCddb::slotNoEntry() +{ + emit queryFinished( K3bCddbQuery::NO_ENTRY_FOUND ); +} + + void K3bCddb::remoteQuery() { --- kdeextragear-1/k3b/src/cddb/k3bcddb.h #1.6:1.6.2.1 @@ -69,4 +69,5 @@ class K3bCddb : public QObject void slotSubmitFinished( K3bCddbSubmit* ); void slotMultibleMatches( K3bCddbQuery* ); + void slotNoEntry(); private: