Index: src/ch/FeedbackHandler.cpp
===================================================================
diff -u -N -r08717141ce5f6926116c298cbc9442094a45bb67 -rb9453afbc6264bc3f3c6a7f86fadab7744e0fb16
--- src/ch/FeedbackHandler.cpp	(.../FeedbackHandler.cpp)	(revision 08717141ce5f6926116c298cbc9442094a45bb67)
+++ src/ch/FeedbackHandler.cpp	(.../FeedbackHandler.cpp)	(revision b9453afbc6264bc3f3c6a7f86fadab7744e0fb16)
@@ -41,11 +41,14 @@
 	return eResult;
 }
 
-chengine::EFeedbackResult CFeedbackHandler::FileAlreadyExists(const TFileInfo& spSrcFileInfo, const TFileInfo& spDstFileInfo, FeedbackAlreadyExistsRuleList& rNewRules)
+chengine::EFeedbackResult CFeedbackHandler::FileAlreadyExists(const TFileInfo& spSrcFileInfo, const TFileInfo& spDstFileInfo, TString& strRenameName, FeedbackAlreadyExistsRuleList& rNewRules)
 {
-	CFeedbackReplaceDlg dlg(spSrcFileInfo, spDstFileInfo);
+	CFeedbackReplaceDlg dlg(spSrcFileInfo, spDstFileInfo, strRenameName);
 	EFeedbackResult eResult = (EFeedbackResult)dlg.DoModal();
 
+	if(eResult == eResult_Rename)
+		strRenameName = dlg.GetNewName();
+
 	if(!dlg.GetRules().IsEmpty())
 		rNewRules = dlg.GetRules();