X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FForkedCalls.cpp;h=d77248eadcb12bb35e45e959afbc755e38808d74;hb=faa87bf9f30b943397429a04254d96963bbf38bc;hp=9957af2119e1f74ca50f380da10dabffe0324c27;hpb=9c365e841ea9ffce74d8b1e3466b12d848062f94;p=lyx.git

diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp
index 9957af2119..d77248eadc 100644
--- 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_ = 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_ = 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