Index: src/ch/TTaskManagerWrapper.cpp
===================================================================
diff -u -N -r25129f39720523eca2cb702242890a7862f70ec6 -rd18db617f4727a237c94b59af9b4328f829eda16
--- src/ch/TTaskManagerWrapper.cpp	(.../TTaskManagerWrapper.cpp)	(revision 25129f39720523eca2cb702242890a7862f70ec6)
+++ src/ch/TTaskManagerWrapper.cpp	(.../TTaskManagerWrapper.cpp)	(revision d18db617f4727a237c94b59af9b4328f829eda16)
@@ -24,6 +24,8 @@
 #include "..\libchcore\TTaskDefinition.h"
 #include "..\libchcore\TTask.h"
 #include "..\libchcore\TBaseException.h"
+#include "CfgProperties.h"
+#include "ch.h"
 
 TTaskManagerWrapper::TTaskManagerWrapper(const chcore::TTaskManagerPtr& spTaskManager) :
 	m_spTaskManager(spTaskManager)
@@ -32,12 +34,8 @@
 
 chcore::TTaskPtr TTaskManagerWrapper::CreateTask(chcore::TTaskDefinition& rTaskDefinition)
 {
-	ictranslate::CResourceManager& rResourceManager = ictranslate::CResourceManager::Acquire();
+	UpdateFileNamingFormat(rTaskDefinition.GetConfiguration());
 
-	// load resource strings
-	chcore::SetTaskPropValue<chcore::eTO_AlternateFilenameFormatString_First>(rTaskDefinition.GetConfiguration(), rResourceManager.LoadString(IDS_FIRSTCOPY_STRING));
-	chcore::SetTaskPropValue<chcore::eTO_AlternateFilenameFormatString_AfterFirst>(rTaskDefinition.GetConfiguration(), rResourceManager.LoadString(IDS_NEXTCOPY_STRING));
-
 	CString strMessage;
 	try
 	{
@@ -62,7 +60,7 @@
 		strMessage = e.what();
 	}
 
-
+	ictranslate::CResourceManager& rResourceManager = ictranslate::CResourceManager::Acquire();
 	ictranslate::CFormat fmt;
 
 	fmt.SetFormat(rResourceManager.LoadString(IDS_TASK_CREATE_FAILED));
@@ -71,3 +69,26 @@
 
 	return nullptr;
 }
+
+void TTaskManagerWrapper::UpdateFileNamingFormat(chcore::TConfig& rTaskConfig)
+{
+	ictranslate::CResourceManager& rResourceManager = ictranslate::CResourceManager::Acquire();
+
+	CString strFirstCopyFormat;
+	CString strSubsequentCopyFormat;
+	bool bUseCustomNaming = GetPropValue<PP_USECUSTOMNAMING>(GetConfig());
+	if(bUseCustomNaming)
+	{
+		strFirstCopyFormat = GetPropValue<PP_CUSTOMNAME_FIRST>(GetConfig());
+		strSubsequentCopyFormat = GetPropValue<PP_CUSTOMNAME_SUBSEQUENT>(GetConfig());
+	}
+	else
+	{
+		strFirstCopyFormat = rResourceManager.LoadString(IDS_FIRSTCOPY_STRING);
+		strSubsequentCopyFormat = rResourceManager.LoadString(IDS_NEXTCOPY_STRING);
+	}
+
+	// load resource strings
+	chcore::SetTaskPropValue<chcore::eTO_AlternateFilenameFormatString_First>(rTaskConfig, (PCTSTR)strFirstCopyFormat);
+	chcore::SetTaskPropValue<chcore::eTO_AlternateFilenameFormatString_AfterFirst>(rTaskConfig, (PCTSTR)strSubsequentCopyFormat);
+}