Simplify code by using initializer lists for vectors.

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index cb98b44194f86b3eaab0c3b5f8a39183885fa364..0c541c894b8fa730f6c95a7abef24930dbfe4568 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -595,8 +595,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 +866,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;