mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-03 20:57:52 +02:00
Code Issues Releases Wiki Activity

* Always wait for DatabaseResolvers to finish before shunting queries.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-01 02:37:55 +02:00
parent 243997b06e
commit c06b5ea2f6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/database/databaseresolver.h
View File

@@ -1,5 +1,5 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> === /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
* *
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org> * Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* *
* Tomahawk is free software: you can redistribute it and/or modify * Tomahawk is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ public:
virtual QString name() const; virtual QString name() const;
virtual unsigned int weight() const { return m_weight; } virtual unsigned int weight() const { return m_weight; }
virtual unsigned int preference() const { return 100; } virtual unsigned int preference() const { return 100; }
virtual unsigned int timeout() const { return 2500; } virtual unsigned int timeout() const { return 0; }
public slots: public slots:
virtual void resolve( const Tomahawk::query_ptr& query ); virtual void resolve( const Tomahawk::query_ptr& query );

4
src/libtomahawk/pipeline.cpp
View File

@@ -285,7 +285,9 @@ Pipeline::shunt( const query_ptr& q )
emit resolving( q ); emit resolving( q );
m_qidsTimeout.insert( q->id(), true ); m_qidsTimeout.insert( q->id(), true );
new FuncTimeout( r->timeout(), boost::bind( &Pipeline::timeoutShunt, this, q ), this );
if ( r->timeout() > 0 )
new FuncTimeout( r->timeout(), boost::bind( &Pipeline::timeoutShunt, this, q ), this );
} }
else else
{ {