PanelCrc.cpp (p7zip_15.14.1_src_all) | : | PanelCrc.cpp (p7zip_16.02_src_all) | ||
---|---|---|---|---|
skipping to change at line 312 | skipping to change at line 312 | |||
SetStatus(L""); | SetStatus(L""); | |||
CProgressMessageBoxPair &pair = GetMessagePair(Hash.NumErrors != 0); | CProgressMessageBoxPair &pair = GetMessagePair(Hash.NumErrors != 0); | |||
AddHashBundleRes(pair.Message, Hash, fs2us(firstFilePath)); | AddHashBundleRes(pair.Message, Hash, fs2us(firstFilePath)); | |||
LangString(IDS_CHECKSUM_INFORMATION, pair.Title); | LangString(IDS_CHECKSUM_INFORMATION, pair.Title); | |||
return S_OK; | return S_OK; | |||
} | } | |||
HRESULT CApp::CalculateCrc2(const UString &methodName) | HRESULT CApp::CalculateCrc2(const UString &methodName) | |||
{ | { | |||
int srcPanelIndex = GetFocusedPanelIndex(); | unsigned srcPanelIndex = GetFocusedPanelIndex(); | |||
CPanel &srcPanel = Panels[srcPanelIndex]; | CPanel &srcPanel = Panels[srcPanelIndex]; | |||
CRecordVector<UInt32> indices; | CRecordVector<UInt32> indices; | |||
srcPanel.GetOperatedIndicesSmart(indices); | srcPanel.GetOperatedIndicesSmart(indices); | |||
if (indices.IsEmpty()) | if (indices.IsEmpty()) | |||
return S_OK; | return S_OK; | |||
if (!srcPanel.Is_IO_FS_Folder()) | if (!srcPanel.Is_IO_FS_Folder()) | |||
{ | { | |||
CCopyToOptions options; | CCopyToOptions options; | |||
skipping to change at line 381 | skipping to change at line 381 | |||
} | } | |||
RefreshTitleAlways(); | RefreshTitleAlways(); | |||
return S_OK; | return S_OK; | |||
} | } | |||
void CApp::CalculateCrc(const UString &methodName) | void CApp::CalculateCrc(const UString &methodName) | |||
{ | { | |||
HRESULT res = CalculateCrc2(methodName); | HRESULT res = CalculateCrc2(methodName); | |||
if (res != S_OK && res != E_ABORT) | if (res != S_OK && res != E_ABORT) | |||
{ | { | |||
int srcPanelIndex = GetFocusedPanelIndex(); | unsigned srcPanelIndex = GetFocusedPanelIndex(); | |||
CPanel &srcPanel = Panels[srcPanelIndex]; | CPanel &srcPanel = Panels[srcPanelIndex]; | |||
srcPanel.MessageBoxError(res); | srcPanel.MessageBoxError(res); | |||
} | } | |||
} | } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |