Merge with develop

--HG-- branch : compatibility-develop
9 years ago · e6b2e0088b
parent 5adebf258d 5892fb8c1c
commit e6b2e0088b
1 changed files with 1 additions and 1 deletions
--- a/code/nel/tools/3d/tga_2_dds/tga2dds.cpp
+++ b/code/nel/tools/3d/tga_2_dds/tga2dds.cpp
@ -390,7 +390,7 @@ int main(int argc, char **argv)
 			// if OptOutputFileName is a directory, append the original filename
 			if (CFile::isDirectory(OptOutputFileName))
 			{
-				outputFileName = CPath::standardizePath(outputFileName) + getOutputFileName(inputFileName);
+				outputFileName = CPath::standardizePath(OptOutputFileName) + CFile::getFilename(getOutputFileName(inputFileName));
 			}
 			else
 			{