Fix 'Export As...' in non-English localizations

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

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index ca804096603eb81b7f35732fe6bac5e6ac8820ab..0ab7685b5cf4ff2e324e909b36b2ea2a414fcebe 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -251,19 +251,17 @@ int Systemcall::startscript(Starttype how, string const & what,
        SystemcallPrivate d(infile, outfile, errfile);
 
 
-       d.startProcess(cmd, path);
-       if (!d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
+       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;
        }
 
-       if (how == DontWait) {
-               QProcess* released = d.releaseProcess();
-               (void) released; // TODO who deletes it?
-               return 0;
-       }
-
        if (!d.waitWhile(SystemcallPrivate::Running, process_events,
                         os::timeout_min() * 60 * 1000)) {
                LYXERR0("Systemcall: '" << cmd << "' did not finish!");
@@ -349,10 +347,18 @@ SystemcallPrivate::SystemcallPrivate(std::string const & sf,
 }
 
 
-void SystemcallPrivate::startProcess(QString const & cmd, string const & path)
+void SystemcallPrivate::startProcess(QString const & cmd, string const & path, bool detached)
 {
        cmd_ = cmd;
-       if (process_) {
+       if (detached) {
+               state = SystemcallPrivate::Running;
+               if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path)) + cmd_)) {
+                       state = SystemcallPrivate::Error;
+                       return;
+               }
+               QProcess* released = releaseProcess();
+               delete released;
+       } else if (process_) {
                state = SystemcallPrivate::Starting;
                process_->start(toqstr(latexEnvCmdPrefix(path)) + cmd_);
        }