anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash reported by Scott on the list. The test on latexname() was

Browse Source 
obviously wrong. We want to know if we are in the same layout, and
that is not enough.
This commit is contained in:
Richard Heck 2013-07-17 09:14:39 -04:00
parent 6f9a272ca3
commit a34ce7ca85
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output_xhtml.cpp
View File

@ -864,15 +864,19 @@ ParagraphList::const_iterator findEndOfEnvironment(
// it can happen. We pretend that it's just at lowest depth.
if (style.latextype == LATEX_COMMAND)
return p;
// If depth is down, we're done
if (p->params().depth() < depth)
return p;
// If depth is up, we're not done
if (p->params().depth() > depth)
continue;
// Now we know we are at the same depth
if (style.latextype == LATEX_PARAGRAPH
|| style.latexname() != bstyle.latexname())
// FIXME I am not sure about the first check.
// Surely we *could* have different layouts that count as
// LATEX_PARAGRAPH, right?
if (style.latextype == LATEX_PARAGRAPH || style != bstyle)
return p;
}
return pend;