Fix thinko in loop detection

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index d803309dff45cfafae0274ce98553e1e63e65b09..8085b15a8505b23d0f24cf50ccb971bc1215e9d1 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -32,7 +32,7 @@
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
 #include "support/Systemcall.h"
 
 using namespace std;
@@ -99,7 +99,7 @@ Converter::Converter(string const & f, string const & t,
                     string const & c, string const & l)
        : from(f), to(t), command(c), flags(l),
          From(0), To(0), latex(false), xml(false),
-         need_aux(false)
+         need_aux(false), nice(false)
 {}
 
 
@@ -450,7 +450,6 @@ bool Converters::convert(Buffer const * buffer,
                        command = subst(command, token_orig_path, quoteName(onlyPath(orig_from.absFileName())));
                        command = subst(command, token_orig_from, quoteName(onlyFileName(orig_from.absFileName())));
                        command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string());
-                       command = libScriptSearch(command);
 
                        if (!conv.parselog.empty())
                                command += " 2> " + quoteName(infile2 + ".out");
@@ -494,8 +493,7 @@ bool Converters::convert(Buffer const * buffer,
   
                                if (!conv.parselog.empty()) {
                                        string const logfile =  infile2 + ".log";
-                                       string const script = libScriptSearch(conv.parselog);
-                                       string const command2 = script +
+                                       string const command2 = conv.parselog +
                                                " < " + quoteName(infile2 + ".out") +
                                                " > " + quoteName(logfile);
                                        one.startscript(Systemcall::Wait,
@@ -726,7 +724,7 @@ vector<Format const *> const
 Converters::getReachable(string const & from, bool const only_viewable,
                         bool const clear_visited, set<string> const & excludes)
 {
-       set<int> excluded_numbers;;
+       set<int> excluded_numbers;
 
        set<string>::const_iterator sit = excludes.begin();
        set<string>::const_iterator const end = excludes.end();