Commit acecf407 authored by Ralf Engels's avatar Ralf Engels
Browse files

Fix: Copy/Move to collection picks up wrong destination path and fails silently

BUG: 314460
FIXED-IN: 2.8
parent 7c780bf5
......@@ -485,7 +485,7 @@ UmsCollection::organizedUrl( Meta::TrackPtr track, const QString &fileExtension
{
TrackOrganizer trackOrganizer( Meta::TrackList() << track );
//%folder% prefix required to get absolute url.
trackOrganizer.setFormatString( "%folder%/" + m_musicFilenameScheme + ".%filetype%" );
trackOrganizer.setFormatString( "%collectionroot%/" + m_musicFilenameScheme + ".%filetype%" );
trackOrganizer.setVfatSafe( m_vfatSafe );
trackOrganizer.setAsciiOnly( m_asciiOnly );
trackOrganizer.setFolderPrefix( m_musicPath.path() );
......
......@@ -240,6 +240,9 @@ UmsTransferJob::slotResult( KJob *job )
else
Debug::warning() << __PRETTY_FUNCTION__ << "invalid job passed to me!";
}
else
Debug::warning() << __PRETTY_FUNCTION__ << "job failed with" << job->error();
// transcoding job currently doesn't emit percentage, so emit it at least once for track
emitPercent( m_totalTracks - m_transferList.size() , m_totalTracks );
startNextJob();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment