summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-01-07 11:33:08 +0200
committerTor Lillqvist <tml@collabora.com>2014-01-07 14:23:01 +0200
commitd90fa180dd76e55f5d480f63ce5e484e31307783 (patch)
tree09f61cf0bef96f7bf6b75a4219d3058859a2a631
parent8e3cb2d536adca7de2acde3cc68f25c32fa2b583 (diff)
Avoid assertion failure if group has been disabled
Change-Id: I918f2716778ddd9ede56b5df731a531f97a3b24d
-rw-r--r--sc/source/core/tool/clkernelthread.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/core/tool/clkernelthread.cxx b/sc/source/core/tool/clkernelthread.cxx
index 651d3690a5ac..2a619c5cdbad 100644
--- a/sc/source/core/tool/clkernelthread.cxx
+++ b/sc/source/core/tool/clkernelthread.cxx
@@ -48,7 +48,9 @@ void CLBuildKernelThread::execute()
switch (aWorkItem.meWhatToDo)
{
case CLBuildKernelWorkItem::COMPILE:
- SAL_INFO("sc.opencl.thread", "told to compile group " << aWorkItem.mxGroup << " to binary");
+ SAL_INFO("sc.opencl.thread", "told to compile group " << aWorkItem.mxGroup << " (state " << aWorkItem.mxGroup->meCalcState << ") to binary");
+ if (aWorkItem.mxGroup->meCalcState == sc::GroupCalcDisabled)
+ break;
assert(aWorkItem.mxGroup->meCalcState == sc::GroupCalcOpenCLKernelCompilationScheduled);
aWorkItem.mxGroup->mpCompiledFormula =
sc::FormulaGroupInterpreter::getStatic()->createCompiledFormula(*aWorkItem.mxGroup->mpTopCell->GetDocument(),