]> git.lyx.org Git - lyx.git/commitdiff
Do not use QProcess::startDetached on Windows
authorVincent van Ravesteijn <vfr@lyx.org>
Tue, 18 Mar 2014 21:32:57 +0000 (22:32 +0100)
committerVincent van Ravesteijn <vfr@lyx.org>
Wed, 19 Mar 2014 07:29:38 +0000 (08:29 +0100)
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 5225821242887ff552b7370df9c830af5f17d3b3.

Fixes: #9035.
src/support/Systemcall.cpp

index 0ab7685b5cf4ff2e324e909b36b2ea2a414fcebe..c42ed0c1434f8efda37d7efcf1192c2e9346d01d 100644 (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)) {