Kaydet (Commit) 17320183 authored tarafından Michael Meeks's avatar Michael Meeks

sw: avoid busy loop waiting for OLE objects to load.

Change-Id: I7f26a88d3dcdb47260eb95f7803702d55f4a9119
Reviewed-on: https://gerrit.libreoffice.org/31164Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst 93399570
...@@ -685,16 +685,11 @@ public: ...@@ -685,16 +685,11 @@ public:
} }
void waitFinished() void waitFinished()
{
while(!isFinished() && !mbKilled)
{ {
// need to wait until the load in progress is finished. // need to wait until the load in progress is finished.
// to do so, Application::Yield() is needed since the execution // WorkerThreads need the SolarMutex to be able to continue
// here means that the SolarMutex is locked, but the // and finish the running import.
// WorkerThreads need it to be able to continue and finish SolarMutexReleaser aReleaser;
// the running import
Application::Yield();
}
comphelper::ThreadPool::getSharedOptimalPool().waitUntilDone(mpTag); comphelper::ThreadPool::getSharedOptimalPool().waitUntilDone(mpTag);
} }
}; };
......
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