Index: src/ch/FeedbackHandler.cpp =================================================================== diff -u -N -r458af7bf8c35950fdeb4b906950437596324aea1 -r04a9f2496d5931c7e06ff815fb8d0e3eabaf2cf2 --- src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision 458af7bf8c35950fdeb4b906950437596324aea1) +++ src/ch/FeedbackHandler.cpp (.../FeedbackHandler.cpp) (revision 04a9f2496d5931c7e06ff815fb8d0e3eabaf2cf2) @@ -70,7 +70,7 @@ return eResult_Unknown; chcore::FEEDBACK_FILEERROR* pData = (chcore::FEEDBACK_FILEERROR*)pFeedbackParam; - CFeedbackFileErrorDlg dlg(pData->pszSrcPath, pData->pszDstPath, pData->ulError); + CFeedbackFileErrorDlg dlg(pData->strSrcPath.c_str(), pData->strDstPath.c_str(), pData->ulError); eFeedbackResult = (EFeedbackResult)dlg.DoModal(); bUseForAllItems = dlg.m_bAllItems; @@ -83,7 +83,7 @@ return eResult_Unknown; chcore::FEEDBACK_NOTENOUGHSPACE* pData = (chcore::FEEDBACK_NOTENOUGHSPACE*)pFeedbackParam; - CFeedbackNotEnoughSpaceDlg dlg(pData->ullRequiredSize, pData->pszSrcPath, pData->pszDstPath); + CFeedbackNotEnoughSpaceDlg dlg(pData->ullRequiredSize, pData->strSrcPath.c_str(), pData->strDstPath.c_str()); eFeedbackResult = (EFeedbackResult)dlg.DoModal(); bUseForAllItems = dlg.m_bAllItems; Index: src/libchcore/IFeedbackHandler.h =================================================================== diff -u -N -r458af7bf8c35950fdeb4b906950437596324aea1 -r04a9f2496d5931c7e06ff815fb8d0e3eabaf2cf2 --- src/libchcore/IFeedbackHandler.h (.../IFeedbackHandler.h) (revision 458af7bf8c35950fdeb4b906950437596324aea1) +++ src/libchcore/IFeedbackHandler.h (.../IFeedbackHandler.h) (revision 04a9f2496d5931c7e06ff815fb8d0e3eabaf2cf2) @@ -20,6 +20,7 @@ #define __FEEDBACKHANDLERBASE_H__ #include "libchcore.h" +#include "TString.h" BEGIN_CHCORE_NAMESPACE @@ -45,17 +46,17 @@ struct FEEDBACK_FILEERROR { - const wchar_t* pszSrcPath; - const wchar_t* pszDstPath; + TString strSrcPath; + TString strDstPath; EFileError eFileError; // error type ulong_t ulError; // system error }; struct FEEDBACK_NOTENOUGHSPACE { ull_t ullRequiredSize; - const wchar_t* pszSrcPath; - const wchar_t* pszDstPath; + TString strSrcPath; + TString strDstPath; }; class LIBCHCORE_API IFeedbackHandler Index: src/libchcore/TSubTaskCopyMove.cpp =================================================================== diff -u -N -ree9b975618a07beb840aca724732da87b522d54b -r04a9f2496d5931c7e06ff815fb8d0e3eabaf2cf2 --- src/libchcore/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision ee9b975618a07beb840aca724732da87b522d54b) +++ src/libchcore/TSubTaskCopyMove.cpp (.../TSubTaskCopyMove.cpp) (revision 04a9f2496d5931c7e06ff815fb8d0e3eabaf2cf2) @@ -470,7 +470,7 @@ unsigned long long ullSeekTo = m_tSubTaskStats.GetCurrentItemProcessedSize(); bool bDstFileFreshlyCreated = false; - if(m_tSubTaskStats.GetCurrentItemProcessedSize() == 0) + if (ullSeekTo == 0) { // open destination file for case, when we start operation on this file (i.e. it is not resume of the // old operation)