Fix the construction of a filepath after r29498. The '/' between the path and suffix was omitted when the path is a directory.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29503 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-05-02 21:29:54 +00:00
parent d16c3b4d7c
commit 3045d9b4ff

View File

@ -221,11 +221,11 @@ void FileName::set(string const & name)
void FileName::set(FileName const & rhs, string const & suffix) void FileName::set(FileName const & rhs, string const & suffix)
{ {
d->name = rhs.d->name + suffix;
if (!rhs.d->fi.isDir()) if (!rhs.d->fi.isDir())
d->fi.setFile(rhs.d->fi.filePath() + toqstr(suffix)); d->fi.setFile(rhs.d->fi.filePath() + toqstr(suffix));
else else
d->fi.setFile(QDir(rhs.d->fi.absoluteFilePath()), toqstr(suffix)); d->fi.setFile(QDir(rhs.d->fi.absoluteFilePath()), toqstr(suffix));
d->name = fromqstr(d->fi.absoluteFilePath());
//LYXERR(Debug::FILES, "FileName::set(" << d->name << ')'); //LYXERR(Debug::FILES, "FileName::set(" << d->name << ')');
LASSERT(empty() || isAbsolute(d->name), /**/); LASSERT(empty() || isAbsolute(d->name), /**/);
} }