summaryrefslogtreecommitdiffstats
path: root/src/extension/implementation
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-02-15 17:52:58 +0000
committerJabiertxo Arraiza Zenotz <jtx@jtx.marker.es>2013-02-15 17:52:58 +0000
commite3ecf9560faa54d783ff216310ddb27ed3702c9e (patch)
tree3a5fc3b625e39b80027af955aad8c6a1791442e7 /src/extension/implementation
parentAll done except cusp continuous and close bspline (diff)
parentMerge to trunk (diff)
downloadinkscape-e3ecf9560faa54d783ff216310ddb27ed3702c9e.tar.gz
inkscape-e3ecf9560faa54d783ff216310ddb27ed3702c9e.zip
update from Trunk
(bzr r11950.1.33)
Diffstat (limited to 'src/extension/implementation')
-rw-r--r--src/extension/implementation/script.cpp9
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;