]> git.lyx.org Git - features.git/commitdiff
Make sure to check command for emptiness, instead of prefix+command.
authorEnrico Forestieri <forenr@lyx.org>
Sun, 25 Sep 2011 20:49:53 +0000 (20:49 +0000)
committerEnrico Forestieri <forenr@lyx.org>
Sun, 25 Sep 2011 20:49:53 +0000 (20:49 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39762 a592a061-630c-0410-9148-cb99ea01b6c8

src/support/ForkedCalls.cpp

index 9957af2119e1f74ca50f380da10dabffe0324c27..1c5e663723f765e3aa547e4b108d729135007fdc 100644 (file)
@@ -282,7 +282,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
                return retval_;
        }
 
-       command_ = what;
+       command_ = trim(what);
        signal_.reset();
        return run(Wait);
 }
@@ -290,7 +290,7 @@ int ForkedCall::startScript(Starttype wait, string const & what)
 
 int ForkedCall::startScript(string const & what, SignalTypePtr signal)
 {
-       command_ = what;
+       command_ = trim(what);
        signal_  = signal;
 
        return run(DontWait);
@@ -300,10 +300,11 @@ int ForkedCall::startScript(string const & what, SignalTypePtr signal)
 // generate child in background
 int ForkedCall::generateChild()
 {
-       string const line = trim(cmd_prefix_ + command_);
-       if (line.empty())
+       if (command_.empty())
                return 1;
 
+       string const line = cmd_prefix_ + command_;
+
 #if !defined (_WIN32)
        // POSIX