diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-05-19 20:54:36 +0100 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-05-19 20:54:36 +0100 |
| commit | 5399425f534e2d96d07cf29f427bfa0f39d904b7 (patch) | |
| tree | b2134c0b8e624b9df89904b942909ea3a688c563 /libs/ardour/system_exec.cc | |
| parent | 529a31bde7d17cade6c942e11e098f2c37d984a3 (diff) | |
| parent | c464feb6aa96226856305531fedb8fba2e06689e (diff) | |
Merge branch 'export-dialog' into cairocanvas
Fix merge conflicts in:
gtk2_ardour/export_range_markers_dialog.cc
gtk2_ardour/wscript
libs/ardour/ardour/export_handler.h
libs/ardour/system_exec.cc
libs/pbd/pbd/system_exec.h
libs/pbd/system_exec.cc
Diffstat (limited to 'libs/ardour/system_exec.cc')
| -rw-r--r-- | libs/ardour/system_exec.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libs/ardour/system_exec.cc b/libs/ardour/system_exec.cc index 90e729a7f6..760a9b7878 100644 --- a/libs/ardour/system_exec.cc +++ b/libs/ardour/system_exec.cc @@ -65,4 +65,14 @@ SystemExec::SystemExec (std::string c, std::string a) #endif } +SystemExec::SystemExec (std::string c, const std::map<char, std::string> subs) + : PBD::SystemExec(c, subs) +{ +#ifndef PLATFORM_WINDOWS + if (!_vfork_exec_wrapper) { + _vfork_exec_wrapper = vfork_exec_wrapper_path(); + } +#endif +} + SystemExec::~SystemExec() { } |