| commit | 5ffdcea247f64e36f56cfbfa3ba2bde0777945d6 | |
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | |
| Fri, 18 Jul 2014 08:02:48 +0000 (18 10:02 +0200) | ||
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | |
| Thu, 4 Dec 2014 11:23:00 +0000 (4 12:23 +0100) | ||
| tree | 4ae42534e9124f6c43fdd36824968bbb67748536 | treesnapshot (tar.gz zip) |
| parent | 9001834224d6ded520505653c03333259c0fc963 | commitdiff |
Use OfficeIPCThread::WaitForReady rather than sleeping.
This way we actually continue when we're ready to, rather than
dumbly hoping we wait for long enough.
This isn't entirely unproblematic though -- if we have no config
pre-prepared (i.e. first-run), then we just end up hanging on this
since soffice_main exits without doing anything to the OfficeIPCThread.
(Which is especially problematic for unit tests which specifically run
on an empty config.)
Change-Id: I064fb500a224cfe37a0d3ba24b6154ffd72a71a3
This way we actually continue when we're ready to, rather than
dumbly hoping we wait for long enough.
This isn't entirely unproblematic though -- if we have no config
pre-prepared (i.e. first-run), then we just end up hanging on this
since soffice_main exits without doing anything to the OfficeIPCThread.
(Which is especially problematic for unit tests which specifically run
on an empty config.)
Change-Id: I064fb500a224cfe37a0d3ba24b6154ffd72a71a3
| desktop/source/lib/init.cxx | diffblobblamehistory |