From c18d8568c7fdddb4a4b2f8bfacf65993bd70d87c Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 19 Dec 2013 17:39:57 +0100 Subject: [PATCH] If a tomahawk link has a xspf, be sure to load it from GAM. --- src/tomahawk/TomahawkApp.cpp | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp index ff151fc7d..2bceb5939 100644 --- a/src/tomahawk/TomahawkApp.cpp +++ b/src/tomahawk/TomahawkApp.cpp @@ -719,23 +719,26 @@ TomahawkApp::activate() bool TomahawkApp::loadUrl( const QString& url ) { - QFile f( url ); - QFileInfo info( f ); - if ( info.suffix() == "xspf" ) + if ( !url.startsWith( "tomahawk://" ) ) { - XSPFLoader* l = new XSPFLoader( true, this ); - tDebug( LOGINFO ) << "Loading spiff:" << url; - l->load( QUrl::fromUserInput( url ) ); + QFile f( url ); + QFileInfo info( f ); + if ( info.suffix() == "xspf" ) + { + XSPFLoader* l = new XSPFLoader( true, this ); + tDebug( LOGINFO ) << "Loading spiff:" << url; + l->load( QUrl::fromUserInput( url ) ); - return true; - } - else if ( info.suffix() == "jspf" ) - { - JSPFLoader* l = new JSPFLoader( true, this ); - tDebug( LOGINFO ) << "Loading j-spiff:" << url; - l->load( QUrl::fromUserInput( url ) ); + return true; + } + else if ( info.suffix() == "jspf" ) + { + JSPFLoader* l = new JSPFLoader( true, this ); + tDebug( LOGINFO ) << "Loading j-spiff:" << url; + l->load( QUrl::fromUserInput( url ) ); - return true; + return true; + } } return GlobalActionManager::instance()->openUrl( url );