4.60 beta

This commit is contained in:
Igor Pavlov
2008-08-19 00:00:00 +00:00
committed by Kornel Lesiński
parent 173c07e166
commit c10e6b16f6
107 changed files with 490 additions and 503 deletions

View File

@@ -94,9 +94,9 @@ UString CAgentFolder::GetPrefix(UInt32 index) const
const CProxyItem &item = _items[index];
const CProxyFolder *folder = item.Folder;
UString path;
while(folder != _proxyFolderItem)
while (folder != _proxyFolderItem)
{
path = folder->Name + UString(L"\\") + path;
path = folder->Name + UString(WCHAR_PATH_SEPARATOR) + path;
folder = folder->Parent;
}
return path;
@@ -460,12 +460,9 @@ STDMETHODIMP CAgent::Open(
DefaultTime = fileInfo.MTime;
DefaultAttrib = fileInfo.Attrib;
ArchiveType = ai.Name;
if (archiveType != 0)
{
CMyComBSTR name = ArchiveType;
*archiveType = name.Detach();
}
return S_OK;
if (archiveType == 0)
return S_OK;
return StringToBstr(ArchiveType, archiveType);
COM_TRY_END
}