From 56f56def725c0d5a50ee8b3b86ccdbf748223f78 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 23 Jan 2016 13:03:27 +0100
Subject: [PATCH] Merge with develop

---
 code/nel/tools/3d/tga_2_dds/tga2dds.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/nel/tools/3d/tga_2_dds/tga2dds.cpp b/code/nel/tools/3d/tga_2_dds/tga2dds.cpp
index f962f99b8..7f3275694 100644
--- 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
 			{