strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

wsd: don't block on autosave

Browse source 
Change-Id: Id87465f0aeea9d4f29caea9c88d3a8c7837d8ec2
Reviewed-on: https://gerrit.libreoffice.org/34191
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2017-02-11 11:36:38 -05:00 committed by Ashod Nakashian
parent f9d54cd058
commit 79c1791764
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wsd/LOOLWSD.cpp
View file

@ -2518,8 +2518,11 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
cleanupDocBrokers(); cleanupDocBrokers();
for (auto& pair : DocBrokers) for (auto& pair : DocBrokers)
{ {
auto docLock = pair.second->getLock(); auto docLock = pair.second->getDeferredLock();
pair.second->autoSave(false, 0, docLock); if (docLock.try_lock())
{
pair.second->autoSave(false, 0, docLock);
}
} }
} }
catch (const std::exception& exc) catch (const std::exception& exc)