Merge with develop

This commit is contained in:
kervala 2016-01-23 13:03:27 +01:00
parent 9e3ef029c6
commit 56f56def72

View file

@ -390,7 +390,7 @@ int main(int argc, char **argv)
// if OptOutputFileName is a directory, append the original filename // if OptOutputFileName is a directory, append the original filename
if (CFile::isDirectory(OptOutputFileName)) if (CFile::isDirectory(OptOutputFileName))
{ {
outputFileName = CPath::standardizePath(outputFileName) + getOutputFileName(inputFileName); outputFileName = CPath::standardizePath(OptOutputFileName) + CFile::getFilename(getOutputFileName(inputFileName));
} }
else else
{ {