mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-13 01:24:11 +02:00
Merge remote branch 'origin' into phonon
This commit is contained in:
@@ -609,7 +609,7 @@ Servent::remoteIODeviceFactory( const result_ptr& result )
|
||||
const QString sourceName = parts.at( 0 );
|
||||
const QString fileId = parts.at( 1 );
|
||||
source_ptr s = SourceList::instance()->get( sourceName );
|
||||
if ( s.isNull() )
|
||||
if ( s.isNull() || !s->controlConnection() )
|
||||
return sp;
|
||||
|
||||
ControlConnection* cc = s->controlConnection();
|
||||
|
@@ -300,7 +300,7 @@ DynamicView::paintEvent( QPaintEvent* event )
|
||||
bg.moveTo( m_fadingPointAnchor ); // cover up the background
|
||||
if( m_fadebg ) {
|
||||
p.save();
|
||||
|
||||
p.fillRect( bg, Qt::white );
|
||||
p.setOpacity( 1 - m_fadeOutAnim.currentValue() );
|
||||
}
|
||||
p.drawPixmap( bg, m_bg );
|
||||
|
Reference in New Issue
Block a user