anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not use QProcess::startDetached on Windows

Browse Source 
QProcess::startDetached cannot provide environment variables. When the
environment variables are set using the latexEnvCmdPrefix, a console
window is shown every time a viewer is started.

On Windows, this reverts commit 5225821242.

Fixes: #9035.
This commit is contained in:
Vincent van Ravesteijn 2014-03-18 22:32:57 +01:00
parent c192745268
commit d44b465efa
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/support/Systemcall.cpp
View File

@ -250,17 +250,29 @@ int Systemcall::startscript(Starttype how, string const & what,
SystemcallPrivate d(infile, outfile, errfile);
d.startProcess(cmd, path, how == DontWait);
if (how == DontWait && d.state == SystemcallPrivate::Running) {
#ifdef Q_OS_WIN32
d.startProcess(cmd, path, false);
if (!d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
LYXERR0("Systemcall: '" << cmd << "' did not start!");
LYXERR0("error " << d.errorMessage());
return 10;
}
if (how == DontWait) {
d.releaseProcess();
return 0;
}
#else
d.startProcess(cmd, path, how == DontWait);
if (how == DontWait && d.state == SystemcallPrivate::Running)
return 0;
if (d.state == SystemcallPrivate::Error
|| !d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
LYXERR0("Systemcall: '" << cmd << "' did not start!");
LYXERR0("error " << d.errorMessage());
return 10;
}
#endif
if (!d.waitWhile(SystemcallPrivate::Running, process_events,
os::timeout_min() * 60 * 1000)) {