Remove unneeded mutable keywords

[lyx.git] / src / support / ForkedCalls.cpp

diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp
index 9957af2119e1f74ca50f380da10dabffe0324c27..63307970b881d1213c3097dd8a778fd36936a8f3 100644 (file)
--- a/src/support/ForkedCalls.cpp
+++ b/src/support/ForkedCalls.cpp
@@ -113,7 +113,7 @@ bool ForkedProcess::IAmAChild = false;
 
 void ForkedProcess::emitSignal()
 {
-       if (signal_.get()) {
+       if (signal_) {
                signal_->operator()(pid_, retval_);
        }
 }
@@ -282,7 +282,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
                return retval_;
        }
 
-       command_ = what;
+       command_ = commandPrep(trim(what));
        signal_.reset();
        return run(Wait);
 }
@@ -290,7 +290,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
 
 int ForkedCall::startScript(string const & what, SignalTypePtr signal)
 {
-       command_ = what;
+       command_ = commandPrep(trim(what));
        signal_  = signal;
 
        return run(DontWait);
@@ -300,10 +300,14 @@ int ForkedCall::startScript(string const & what, SignalTypePtr signal)
 // generate child in background
 int ForkedCall::generateChild()
 {
-       string const line = trim(cmd_prefix_ + command_);
-       if (line.empty())
+       if (command_.empty())
                return 1;
 
+       // Make sure that a V2 python is run, if available.
+       string const line = cmd_prefix_ +
+               (prefixIs(command_, "python -tt")
+                ? os::python() + command_.substr(10) : command_);
+
 #if !defined (_WIN32)
        // POSIX
 
@@ -377,7 +381,7 @@ int ForkedCall::generateChild()
                vector<char *>::iterator ait = argv.begin();
                vector<char *>::iterator const aend = argv.end();
                lyxerr << "<command>\n\t" << line
-                      << "\n\tInterpretted as:\n\n";
+                      << "\n\tInterpreted as:\n\n";
                for (; ait != aend; ++ait)
                        if (*ait)
                                lyxerr << '\t'<< *ait << '\n';