diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-09-05 20:17:26 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-09-05 20:21:59 +0200 |
commit | 05caadbca3cf3c40264e39eae96b8eed61ededab (patch) | |
tree | 933b31fe032d47c3ca3796ff85bfcdf668e6d35b /rbutil/rbutilqt/base/talkfile.cpp | |
parent | a46e0b02c1ac95d8843e580c0a4bf4d5b3a7452a (diff) | |
download | rockbox-05caadbca3cf3c40264e39eae96b8eed61ededab.tar.gz rockbox-05caadbca3cf3c40264e39eae96b8eed61ededab.zip |
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
Diffstat (limited to 'rbutil/rbutilqt/base/talkfile.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/talkfile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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() | |||
33 | QString errStr; | 33 | QString errStr; |
34 | 34 | ||
35 | emit logItem(tr("Starting Talk file generation for folder %1") | 35 | emit logItem(tr("Starting Talk file generation for folder %1") |
36 | .arg(m_dir.dirName()), LOGINFO); | 36 | .arg(m_dir), LOGINFO); |
37 | emit logProgress(0,0); | 37 | emit logProgress(0,0); |
38 | QCoreApplication::processEvents(); | 38 | QCoreApplication::processEvents(); |
39 | 39 | ||
40 | // read in Maps of paths - file/dirnames | 40 | // read in Maps of paths - file/dirnames |
41 | emit logItem(tr("Reading Filelist..."),LOGINFO); | 41 | emit logItem(tr("Reading Filelist..."),LOGINFO); |
42 | if(createTalkList(m_dir) == false) | 42 | if(createTalkList(m_mountpoint + "/" + m_dir) == false) |
43 | { | 43 | { |
44 | emit logItem(tr("Talk file creation aborted"),LOGERROR); | 44 | emit logItem(tr("Talk file creation aborted"),LOGERROR); |
45 | doAbort(); | 45 | doAbort(); |
@@ -109,6 +109,7 @@ void TalkFileCreator::doAbort() | |||
109 | //! \param startDir The directory from which to start scanning | 109 | //! \param startDir The directory from which to start scanning |
110 | bool TalkFileCreator::createTalkList(QDir startDir) | 110 | bool TalkFileCreator::createTalkList(QDir startDir) |
111 | { | 111 | { |
112 | qDebug() << "[TalkGenerator] generating list of files" << startDir; | ||
112 | m_talkList.clear(); | 113 | m_talkList.clear(); |
113 | 114 | ||
114 | // create Iterator | 115 | // create Iterator |
@@ -213,6 +214,7 @@ bool TalkFileCreator::createTalkList(QDir startDir) | |||
213 | } | 214 | } |
214 | QCoreApplication::processEvents(); | 215 | QCoreApplication::processEvents(); |
215 | } | 216 | } |
217 | qDebug() << "[TalkFileCreator] list created, entries:" << m_talkList.size(); | ||
216 | return true; | 218 | return true; |
217 | } | 219 | } |
218 | 220 | ||