From 825903f294cf52e2e3b2e16b17f849b0334f17fa Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 14 Aug 2011 22:22:58 -0400 Subject: [PATCH] Fix copying automatic playlists and stations --- src/libtomahawk/globalactionmanager.cpp | 6 +++++- src/sourcetree/sourcetreeview.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/globalactionmanager.cpp b/src/libtomahawk/globalactionmanager.cpp index c4abcaa99..851b68fa6 100644 --- a/src/libtomahawk/globalactionmanager.cpp +++ b/src/libtomahawk/globalactionmanager.cpp @@ -187,8 +187,12 @@ GlobalActionManager::copyToClipboard( const query_ptr& query ) const bool -GlobalActionManager::parseTomahawkLink( const QString& url ) +GlobalActionManager::parseTomahawkLink( const QString& urlIn ) { + QString url = urlIn; + if( urlIn.startsWith( "http://toma.hk" ) ) + url.replace( "http://toma.hk/", "tomahawk://" ); + if( url.contains( "tomahawk://" ) ) { QString cmd = url.mid( 11 ); cmd.replace( "%2B", "%20" ); diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index 0652da1fd..5f5fb9e85 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -326,7 +326,7 @@ SourceTreeView::addToLocal() // copy to a link and then generate a new playlist from that // this way we cheaply regenerate the needed controls QString link = GlobalActionManager::instance()->copyPlaylistToClipboard( playlist ); - dynplaylist_ptr p = GlobalActionManager::instance()->loadDynamicPlaylist( link, type == SourcesModel::Station ); + GlobalActionManager::instance()->parseTomahawkLink( link ); } else if ( type == SourcesModel::StaticPlaylist ) {