diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2017-04-30 03:00:00 +0300 |
|---|---|---|
| committer | Kornel <kornel@geekhood.net> | 2017-05-05 20:56:20 +0300 |
| commit | 2efa10565ac395d2ce9a679ead46e70fb2f963eb (patch) | |
| tree | 84c8df4deb69ec44ea15af9378f24347db55c357 /CPP/7zip/UI/FileManager/PanelCrc.cpp | |
| parent | 603abd5528c97346e9448c0ff47949f818fe558c (diff) | |
17.0017.00
Diffstat (limited to 'CPP/7zip/UI/FileManager/PanelCrc.cpp')
| -rw-r--r-- | CPP/7zip/UI/FileManager/PanelCrc.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CPP/7zip/UI/FileManager/PanelCrc.cpp b/CPP/7zip/UI/FileManager/PanelCrc.cpp index c9697e8b..8500a9a5 100644 --- a/CPP/7zip/UI/FileManager/PanelCrc.cpp +++ b/CPP/7zip/UI/FileManager/PanelCrc.cpp @@ -128,14 +128,15 @@ DWORD CDirEnumerator::GetNextFile(NFind::CFileInfo &fi, bool &filled, FString &r FString s = resPath; s.Add_PathSepar(); Prefixes.Add(s); - s += FCHAR_ANY_MASK; - Enumerators.Add(NFind::CEnumerator(BasePrefix + s)); + Enumerators.AddNew().SetDirPrefix(BasePrefix + s); } filled = true; return S_OK; } + + class CThreadCrc: public CProgressThreadVirt { HRESULT ProcessVirt(); @@ -364,7 +365,7 @@ HRESULT CApp::CalculateCrc2(const UString &methodName) UString title = LangString(IDS_CHECKSUM_CALCULATING); t.ProgressDialog.MainWindow = _window; - t.ProgressDialog.MainTitle = L"7-Zip"; // LangString(IDS_APP_TITLE); + t.ProgressDialog.MainTitle = "7-Zip"; // LangString(IDS_APP_TITLE); t.ProgressDialog.MainAddTitle = title; t.ProgressDialog.MainAddTitle.Add_Space(); @@ -374,9 +375,9 @@ HRESULT CApp::CalculateCrc2(const UString &methodName) return S_OK; } -void CApp::CalculateCrc(const UString &methodName) +void CApp::CalculateCrc(const char *methodName) { - HRESULT res = CalculateCrc2(methodName); + HRESULT res = CalculateCrc2(UString(methodName)); if (res != S_OK && res != E_ABORT) { unsigned srcPanelIndex = GetFocusedPanelIndex(); |