Fix bug 9798.

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

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index cc2c3814ab761c17ec360316f1b071e7ea5e21aa..d4f71ffcd9eadd9d95edf2cf004f1e22ee4c059f 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -40,7 +40,7 @@
 
 struct Sleep : QThread
 {
-       static void millisec(unsigned long ms) 
+       static void millisec(unsigned long ms)
        {
                QThread::usleep(ms * 1000);
        }
@@ -55,7 +55,7 @@ namespace lyx {
 namespace support {
 
 
-class ProgressDummy : public ProgressInterface 
+class ProgressDummy : public ProgressInterface
 {
 public:
        ProgressDummy() {}
@@ -231,8 +231,7 @@ string const parsecmd(string const & incmd, string & infile, string & outfile,
        return trim(outcmd[0]);
 }
 
-} // namespace anon
-
+} // namespace
 
 
 int Systemcall::startscript(Starttype how, string const & what,
@@ -253,23 +252,6 @@ int Systemcall::startscript(Starttype how, string const & what,
 
        SystemcallPrivate d(infile, outfile, errfile);
 
-#ifdef Q_OS_WIN32
-       // QProcess::startDetached cannot provide environment variables. When the
-       // environment variables are set using the latexEnvCmdPrefix and the process
-       // is started with QProcess::startDetached, a console window is shown every 
-       // time a viewer is started. To avoid this, we fall back on Windows to the 
-       // original implementation that creates a QProcess object.
-       d.startProcess(cmd, path, lpath, 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, lpath, how == DontWait);
        if (how == DontWait && d.state == SystemcallPrivate::Running)
                return 0;
@@ -280,7 +262,6 @@ int Systemcall::startscript(Starttype how, string const & what,
                LYXERR0("error " << d.errorMessage());
                return 10;
        }
-#endif
 
        if (!d.waitWhile(SystemcallPrivate::Running, process_events,
                         os::timeout_min() * 60 * 1000)) {
@@ -371,6 +352,15 @@ void SystemcallPrivate::startProcess(QString const & cmd, string const & path,
        cmd_ = cmd;
        if (detached) {
                state = SystemcallPrivate::Running;
+#ifdef Q_OS_WIN32
+               // Avoid opening a console window when a viewer is started
+               if (in_file_.empty())
+                       process_->setStandardInputFile(QProcess::nullDevice());
+               if (out_file_.empty())
+                       process_->setStandardOutputFile(QProcess::nullDevice());
+               if (err_file_.empty())
+                       process_->setStandardErrorFile(QProcess::nullDevice());
+#endif
                if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path, lpath)) + cmd_)) {
                        state = SystemcallPrivate::Error;
                        return;
@@ -410,7 +400,7 @@ bool queryStopCommand(QString const & cmd)
                        1, 1, _("&Stop it"), _("Let it &run")) == 0;
 }
 
-}
+} // namespace
 
 
 bool SystemcallPrivate::waitWhile(State waitwhile, bool process_events, int timeout)
@@ -453,7 +443,7 @@ bool SystemcallPrivate::waitWhile(State waitwhile, bool process_events, int time
                        waitAndProcessEvents();
                }
                return state != Error;
-       } 
+       }
 
        // process events while waiting with timeout
        QTime timer;
@@ -556,7 +546,7 @@ void SystemcallPrivate::processError(QProcess::ProcessError)
 }
 
 
-QString SystemcallPrivate::errorMessage() const 
+QString SystemcallPrivate::errorMessage() const
 {
        if (!process_)
                return "No QProcess available";