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

Merge remote-tracking branch 'origin' into phonon

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-03-15 17:18:56 +01:00
parent bbebc8b0fb 283819962c
commit 671cbc627c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/artist.cpp
View File

@@ -25,7 +25,9 @@ Artist::get( unsigned int id, const QString& name, const Tomahawk::collection_pt
}
artist_ptr a = artist_ptr( new Artist( id, name, collection ) );
s_artists.insert( id, a );
if ( id > 0 )
s_artists.insert( id, a );
return a;
}

2
src/scriptresolver.cpp
View File

@@ -195,7 +195,7 @@ ScriptResolver::doSetup( const QVariantMap& m )
qDebug() << Q_FUNC_INFO << m;
m_name = m.value( "name" ).toString();
m_weight = m.value( "weight", 0 ).toUInt();
m_timeout = m.value( "timeout", 5000 ).toUInt();
m_timeout = m.value( "timeout", 25 ).toUInt() * 1000;
m_preference = m.value( "preference", 0 ).toUInt();
qDebug() << "SCRIPT" << m_cmd << "READY," << endl
<< "name" << m_name << endl