From 92efd0da7f05a31e61e273b6d4fbbd7ba2218864 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 3 Aug 2011 23:47:02 +0200 Subject: [PATCH] * Hopefully fixes the file:// issues on Windows. --- src/libtomahawk/audio/audioengine.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp index ef9e0fd96..a1e0e6821 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/audioengine.cpp @@ -373,14 +373,19 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result ) } else { - QUrl furl = m_currentTrack->url(); - if ( !isLocalResult( m_currentTrack->url() ) && m_currentTrack->url().contains( "?" ) ) + if ( !isLocalResult( m_currentTrack->url() ) ) { - furl = QUrl( m_currentTrack->url().left( m_currentTrack->url().indexOf( '?' ) ) ); - furl.setEncodedQuery( QString( m_currentTrack->url().mid( m_currentTrack->url().indexOf( '?' ) + 1 ) ).toLocal8Bit() ); + QUrl furl = m_currentTrack->url(); + if ( m_currentTrack->url().contains( "?" ) ) + { + furl = QUrl( m_currentTrack->url().left( m_currentTrack->url().indexOf( '?' ) ) ); + furl.setEncodedQuery( QString( m_currentTrack->url().mid( m_currentTrack->url().indexOf( '?' ) + 1 ) ).toLocal8Bit() ); + } + m_mediaObject->setCurrentSource( furl ); } + else + m_mediaObject->setCurrentSource( m_currentTrack->url() ); - m_mediaObject->setCurrentSource( furl ); m_mediaObject->currentSource().setAutoDelete( true ); m_isPlayingHttp = true; }