From 05caadbca3cf3c40264e39eae96b8eed61ededab Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Wed, 5 Sep 2012 20:17:26 +0200 Subject: Correctly construct the path for talkfile generation. While TalkFileCreator uses the current mountpoint for writing logging information it does not use it for constructing the correct path to generate talkfiles for. Since there is not much point in generating talkfiles for files that are not on the player (and the UI limits the paths that can get selected to folders on the player) make TalkFileCreator use the mountpoint for creating correct paths. Fixes FS#12748. Change-Id: Id682a3738649e4167556255599553edc6e2acd48 --- rbutil/rbutilqt/base/talkfile.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'rbutil/rbutilqt/base/talkfile.cpp') diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp index b7d080de01..dc4dceef08 100644 --- a/rbutil/rbutilqt/base/talkfile.cpp +++ b/rbutil/rbutilqt/base/talkfile.cpp @@ -33,13 +33,13 @@ bool TalkFileCreator::createTalkFiles() QString errStr; emit logItem(tr("Starting Talk file generation for folder %1") - .arg(m_dir.dirName()), LOGINFO); + .arg(m_dir), LOGINFO); emit logProgress(0,0); QCoreApplication::processEvents(); // read in Maps of paths - file/dirnames emit logItem(tr("Reading Filelist..."),LOGINFO); - if(createTalkList(m_dir) == false) + if(createTalkList(m_mountpoint + "/" + m_dir) == false) { emit logItem(tr("Talk file creation aborted"),LOGERROR); doAbort(); @@ -109,6 +109,7 @@ void TalkFileCreator::doAbort() //! \param startDir The directory from which to start scanning bool TalkFileCreator::createTalkList(QDir startDir) { + qDebug() << "[TalkGenerator] generating list of files" << startDir; m_talkList.clear(); // create Iterator @@ -213,6 +214,7 @@ bool TalkFileCreator::createTalkList(QDir startDir) } QCoreApplication::processEvents(); } + qDebug() << "[TalkFileCreator] list created, entries:" << m_talkList.size(); return true; } -- cgit v1.2.3