diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2013-08-10 12:08:45 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2013-08-13 20:15:47 +1000 |
| commit | 7a431f892ec6e7e2283885c474b680081c983762 (patch) | |
| tree | 59b1e7a9f3f3e07b968a8fbbf916e3520741c9d8 /gtk2_ardour/main.cc | |
| parent | 611058bf5863fd0d34362a20a9ce997092aeed23 (diff) | |
Move curve test file handling in main() until after ARDOUR::init is called
This means it doesn't need to call PBD::ID::init directly, which it now
shouldn't be doing
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 84cd696af1..e619c9d83b 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -482,10 +482,6 @@ int main (int argc, char *argv[]) exit (1); } - if (curvetest_file) { - return curvetest (curvetest_file); - } - cout << PROGRAM_NAME << VERSIONSTRING << _(" (built using ") @@ -518,6 +514,10 @@ int main (int argc, char *argv[]) exit (1); } + if (curvetest_file) { + return curvetest (curvetest_file); + } + if (::signal (SIGPIPE, sigpipe_handler)) { cerr << _("Cannot xinstall SIGPIPE error handler") << endl; } |