From 6e227f18aeb9c6c3c191e3f9b83297837357c506 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Thu, 13 Dec 2012 20:16:50 +0100 Subject: [PATCH] Fix a crash in PreviewLoader for command-line xhtml output While exporting from the command-line, theApp() doesn't exist. The colors foreground and background are only needed when previewing, so ignore this during buffer export. This replaces the fix in 4285b0b3 (Tommaso Cucinotta, 10-12-2012). In this case, we do not need to pull in Qt dependencies. --- src/graphics/PreviewLoader.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp index 6185681f53..10eeee321d 100644 --- a/src/graphics/PreviewLoader.cpp +++ b/src/graphics/PreviewLoader.cpp @@ -583,20 +583,22 @@ void PreviewLoader::Impl::startLoading(bool wait) double const font_scaling_factor = buffer_.isExporting() ? 75.0 * buffer_.params().html_math_img_scale : 0.01 * lyxrc.dpi * lyxrc.zoom * lyxrc.preview_scale_factor; - - // FIXME XHTML - // The colors should be customizable. - ColorCode const bg = buffer_.isExporting() - ? Color_white : PreviewLoader::backgroundColor(); - ColorCode const fg = buffer_.isExporting() - ? Color_black : PreviewLoader::foregroundColor(); + // The conversion command. ostringstream cs; cs << pconverter_->command << " " << quoteName(latexfile.toFilesystemEncoding()) - << " --dpi " << int(font_scaling_factor) - << " --fg " << theApp()->hexName(fg) - << " --bg " << theApp()->hexName(bg); + << " --dpi " << int(font_scaling_factor); + + // FIXME XHTML + // The colors should be customizable. + if (!buffer_.isExporting()) { + ColorCode const fg = PreviewLoader::foregroundColor(); + ColorCode const bg = PreviewLoader::backgroundColor(); + cs << " --fg " << theApp()->hexName(fg) + << " --bg " << theApp()->hexName(bg); + } + // FIXME what about LuaTeX? if (buffer_.params().useNonTeXFonts) cs << " --latex=xelatex"; -- 2.39.5