Possible fix for the mystery crash, which is bug #9049.

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index ed46c051753f97a90f28e29dd0a51ddba0c82887..c7bac75e7ae345bebc0f9a9de70719dbd81f488e 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -554,7 +554,7 @@ void TeXOnePar(Buffer const & buf,
        Paragraph const & par = paragraphs.at(pit);
        // FIXME This check should not really be needed.
        // Perhaps we should issue an error if it is.
-       Layout const style = text.inset().forcePlainLayout() ?
+       Layout const & style = text.inset().forcePlainLayout() ?
                bparams.documentClass().plainLayout() : par.layout();
 
        if (style.inpreamble)
@@ -852,6 +852,7 @@ void TeXOnePar(Buffer const & buf,
        // Is this really needed ? (Dekel)
        // We do not need to use to change the font for the last paragraph
        // or for a command.
+       // Spitz: We need for the last par, actually. See #9231.
 
        Font const font = par.empty()
                 ? par.getLayoutFont(bparams, outerfont)
@@ -860,7 +861,6 @@ void TeXOnePar(Buffer const & buf,
        bool const is_command = style.isCommand();
 
        if (style.resfont.size() != font.fontInfo().size()
-           && nextpar
            && !is_command) {
                os << '{';
                os << "\\" << from_ascii(font.latexSize()) << " \\par}";