Index: src/ch/FeedbackHandler.cpp
===================================================================
diff -u -N -rb9453afbc6264bc3f3c6a7f86fadab7744e0fb16 -rf01ed9a0279a52c96a7272273ef19e57f7670f4a
--- src/ch/FeedbackHandler.cpp	(.../FeedbackHandler.cpp)	(revision b9453afbc6264bc3f3c6a7f86fadab7744e0fb16)
+++ src/ch/FeedbackHandler.cpp	(.../FeedbackHandler.cpp)	(revision f01ed9a0279a52c96a7272273ef19e57f7670f4a)
@@ -1,21 +1,21 @@
-/***************************************************************************
- *   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
- *   ixen@copyhandler.com                                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Library General Public License          *
- *   (version 2) as published by the Free Software Foundation;             *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU Library General Public     *
- *   License along with this program; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
+// ============================================================================
+//  Copyright (C) 2001-2020 by Jozef Starosczyk
+//  ixen {at} copyhandler [dot] com
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU Library General Public License
+//  (version 2) as published by the Free Software Foundation;
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU Library General Public
+//  License along with this program; if not, write to the
+//  Free Software Foundation, Inc.,
+//  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// ============================================================================
 #include "stdafx.h"
 #include "FeedbackHandler.h"
 #include "FeedbackReplaceDlg.h"
@@ -41,15 +41,17 @@
 	return eResult;
 }
 
-chengine::EFeedbackResult CFeedbackHandler::FileAlreadyExists(const TFileInfo& spSrcFileInfo, const TFileInfo& spDstFileInfo, TString& strRenameName, FeedbackAlreadyExistsRuleList& rNewRules)
+chengine::EFeedbackResult CFeedbackHandler::FileAlreadyExists(const TFileInfo& spSrcFileInfo, const TFileInfo& spDstFileInfo, TString& strRenameName, FeedbackRules& rNewRules)
 {
-	CFeedbackReplaceDlg dlg(spSrcFileInfo, spDstFileInfo, strRenameName);
+	rNewRules.ResetModifications();
+
+	CFeedbackReplaceDlg dlg(rNewRules, spSrcFileInfo, spDstFileInfo, strRenameName);
 	EFeedbackResult eResult = (EFeedbackResult)dlg.DoModal();
 
 	if(eResult == eResult_Rename)
 		strRenameName = dlg.GetNewName();
 
-	if(!dlg.GetRules().IsEmpty())
+	if(!dlg.GetRules().IsModified())
 		rNewRules = dlg.GetRules();
 
 	return eResult;