mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-26 19:25:39 +00:00
Fix bug #12466
Amend 109ea2be
by reintroducing the command prefix that was
inadvertently removed. The prefix sets the proper environment
for latex.
This commit is contained in:
parent
2ab548b6f6
commit
777ccce561
@ -305,6 +305,8 @@ int ForkedCall::generateChild()
|
|||||||
if (command_.empty())
|
if (command_.empty())
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
|
string const prefixed_command = cmd_prefix_ + command_;
|
||||||
|
|
||||||
#if !defined (_WIN32)
|
#if !defined (_WIN32)
|
||||||
// POSIX
|
// POSIX
|
||||||
|
|
||||||
@ -312,8 +314,8 @@ int ForkedCall::generateChild()
|
|||||||
// in a contiguous block of memory. The array contains pointers
|
// in a contiguous block of memory. The array contains pointers
|
||||||
// to each word.
|
// to each word.
|
||||||
// Don't forget the terminating `\0' character.
|
// Don't forget the terminating `\0' character.
|
||||||
char const * const c_str = command_.c_str();
|
char const * const c_str = prefixed_command.c_str();
|
||||||
vector<char> vec(c_str, c_str + command_.size() + 1);
|
vector<char> vec(c_str, c_str + prefixed_command.size() + 1);
|
||||||
|
|
||||||
// Splitting the command up into an array of words means replacing
|
// Splitting the command up into an array of words means replacing
|
||||||
// the whitespace between words with '\0'. Life is complicated
|
// the whitespace between words with '\0'. Life is complicated
|
||||||
@ -377,7 +379,7 @@ int ForkedCall::generateChild()
|
|||||||
if (lyxerr.debugging(Debug::FILES)) {
|
if (lyxerr.debugging(Debug::FILES)) {
|
||||||
vector<char *>::iterator ait = argv.begin();
|
vector<char *>::iterator ait = argv.begin();
|
||||||
vector<char *>::iterator const aend = argv.end();
|
vector<char *>::iterator const aend = argv.end();
|
||||||
lyxerr << "<command>\n\t" << command_
|
lyxerr << "<command>\n\t" << prefixed_command
|
||||||
<< "\n\tInterpreted as:\n\n";
|
<< "\n\tInterpreted as:\n\n";
|
||||||
for (; ait != aend; ++ait)
|
for (; ait != aend; ++ait)
|
||||||
if (*ait)
|
if (*ait)
|
||||||
|
Loading…
Reference in New Issue
Block a user