From 978c1e58de00c970e8ffbffef0fdaba9a1d138ed Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 19 Feb 2016 03:50:17 +0100 Subject: [PATCH] Fixed crash in ContextMenu and moved 'open file manager' action up. --- src/libtomahawk/ContextMenu.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp index 3f6d238bd..e2d7a52e9 100644 --- a/src/libtomahawk/ContextMenu.cpp +++ b/src/libtomahawk/ContextMenu.cpp @@ -219,10 +219,21 @@ ContextMenu::setQueries( const QList& queries ) addSeparator(); if ( m_supportedActions & ActionCopyLink && itemCount() == 1 ) + { m_sigmap->setMapping( addAction( tr( "&Copy Track Link" ) ), ActionCopyLink ); + } + + if ( m_supportedActions & ActionOpenFileManager && queries.length() == 1 && + queries.first()->numResults() && + queries.first()->results().first()->resolvedByCollection()->isLocal() ) + { + m_sigmap->setMapping( addAction( tr( "Open Folder in File Manager..." ) ), ActionOpenFileManager ); + } if ( m_supportedActions & ActionEditMetadata && itemCount() == 1 ) + { m_sigmap->setMapping( addAction( tr( "Properties..." ) ), ActionEditMetadata ); + } addSeparator(); @@ -244,11 +255,6 @@ ContextMenu::setQueries( const QList& queries ) addSeparator(); - if ( m_supportedActions & ActionOpenFileManager && queries.length() == 1 && m_queries.first()->results().first()->resolvedByCollection()->isLocal() ) - { - m_sigmap->setMapping( addAction( tr( "Open Folder in File Manager..." ) ), ActionOpenFileManager ); - } - if ( m_supportedActions & ActionDelete ) m_sigmap->setMapping( addAction( queries.count() > 1 ? tr( "&Remove Items" ) : tr( "&Remove Item" ) ), ActionDelete );