Run codespell on src/frontends

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index cb98b44194f86b3eaab0c3b5f8a39183885fa364..3487f4b45eb22e4d13c24411820dd48f74991a18 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -481,8 +481,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                runparams.bibtex_command = bp.bibtexCommand();
                runparams.index_command = (bp.index_command == "default") ?
                        string() : bp.index_command;
-               runparams.document_language = bp.language->babel();
-               runparams.xindy_language = bp.language->xindy();
+               runparams.document_language = bp.language->lang();
                // Some macros rely on font encoding
                runparams.main_fontenc = bp.main_font_encoding();
                runparams.only_childbibs = !bp.useBiblatex()
@@ -595,8 +594,8 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                        // FIXME KILLED
                        // Check changed return value here.
                        RetVal const retval = runLaTeX(*buffer, command, runparams, errorList);
-                               if (retval != SUCCESS)
-                                       return retval;
+                       if (retval != SUCCESS)
+                               return retval;
                } else {
                        if (conv.need_aux() && !run_latex) {
                                // We are not importing, we have a buffer
@@ -866,7 +865,7 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
                });
        int const result = latex.run(terr);
 
-       if (result == Systemcall::KILLED) {
+       if (result == Systemcall::KILLED || result == Systemcall::TIMEOUT) {
                Alert::error(_("Export canceled"),
                        _("The export process was terminated by the user."));
                return KILLED;