Merge with develop
This commit is contained in:
parent
9e3ef029c6
commit
56f56def72
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue