Commit a975cb82 authored by Alexey Golubev's avatar Alexey Golubev Committed by GitHub

Merge pull request #32 from ONLYOFFICE/feature/lenas-fixes

Feature/lenas fixies
parents 122a5cd0 afcf6b07
...@@ -92,13 +92,16 @@ public: ...@@ -92,13 +92,16 @@ public:
bool bResult = pInfo->ReadFromStream(&oUserAtom, pStream); bool bResult = pInfo->ReadFromStream(&oUserAtom, pStream);
offsetToEdit = pInfo->m_oUser.m_nOffsetLastEdit; offsetToEdit = pInfo->m_oUser.m_nOffsetLastEdit;
m_oCurrentUser.m_bIsEncrypt = pInfo->m_bEncrypt;
if (bResult == false) if (bResult == false)
{ {
delete pInfo; delete pInfo;
if (pInfo->m_bEncrypt) return false; if (pInfo->m_bEncrypt)
else continue; return false;
else
continue;
} }
m_arUsers.push_back(pInfo); m_arUsers.push_back(pInfo);
......
...@@ -116,7 +116,7 @@ bool CPPTFileReader::ReadPersists() ...@@ -116,7 +116,7 @@ bool CPPTFileReader::ReadPersists()
CFStreamPtr pStream = GetDocumentStream(); CFStreamPtr pStream = GetDocumentStream();
if (!pStream) return false; if (!pStream) return false;
if (m_oDocumentInfo.ReadFromStream(&m_oCurrentUser, pStream->stream_) == false) return false; return m_oDocumentInfo.ReadFromStream(&m_oCurrentUser, pStream->stream_);
} }
void CPPTFileReader::ReadDocument() void CPPTFileReader::ReadDocument()
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment