diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-02-15 17:41:43 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-02-15 17:41:43 +0000 |
| commit | f986ce1bf97a05515103c828a42ff9a77a244c02 (patch) | |
| tree | d65419c34b2c3b97230d282d508384565e477109 /src/extension/implementation | |
| parent | Removed unused function (diff) | |
| parent | Bug #561503: fix typo in earlier fix (r11133) (diff) | |
| download | inkscape-f986ce1bf97a05515103c828a42ff9a77a244c02.tar.gz inkscape-f986ce1bf97a05515103c828a42ff9a77a244c02.zip | |
Merge to trunk
(bzr r11950.2.3)
Diffstat (limited to 'src/extension/implementation')
| -rw-r--r-- | src/extension/implementation/script.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index d3aeace55..4af778e04 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -956,7 +956,14 @@ int Script::execute (const std::list<std::string> &in_command, // assemble the rest of argv std::copy(in_params.begin(), in_params.end(), std::back_inserter(argv)); if (!filein.empty()) { - argv.push_back(filein); + if(Glib::path_is_absolute(filein)) + argv.push_back(filein); + else { + std::vector<std::string> buildargs; + buildargs.push_back(Glib::get_current_dir()); + buildargs.push_back(filein); + argv.push_back(Glib::build_filename(buildargs)); + } } int stdout_pipe, stderr_pipe; |