Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Case where additional files are not in source directory

Browse source
This commit is contained in:
kervala 2016-10-18 13:37:43 +02:00
parent c7a5ee9e24
commit ae71ce0f89
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/tools/client/ryzom_installer/src/filescopier.cpp
View file

@ -75,8 +75,18 @@ void CFilesCopier::getFile(const QFileInfo &fileInfo, const QDir &srcDir, FilesT
// full path to file // full path to file
QString fullPath = fileInfo.absoluteFilePath(); QString fullPath = fileInfo.absoluteFilePath();
QString relativePath = srcDir.relativeFilePath(fullPath);
QFileInfo relativeFileInfo(relativePath);
// correct absolute path
if (relativeFileInfo.isAbsolute())
{
relativePath = relativeFileInfo.fileName();
}
// full path where to copy file // full path where to copy file
QString dstPath = m_destinationDirectory + "/" + srcDir.relativeFilePath(fullPath); QString dstPath = m_destinationDirectory + "/" + relativePath;
if (fileInfo.isDir()) if (fileInfo.isDir())
{ {