diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-09 18:06:44 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-09 18:06:44 -0400 |
| commit | 29c9d94dbe76f94e8126550fcb9513182b17fbb5 (patch) | |
| tree | 0e843ef775c42ce2720d1c19a5ed9fbb5c699259 /gtk2_ardour | |
| parent | 3633892eaa294b11ae09a9e85fcfdf7349bcd213 (diff) | |
fix control app breakage
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index cbda83c347..c55fc7008b 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -792,19 +792,25 @@ EngineControl::get_device_name () const void EngineControl::control_app_button_clicked () { + const char* env_value = g_getenv ("ARDOUR_DEVICE_CONTROL_APP"); + string appname; - const string appname = g_getenv ("ARDOUR_DEVICE_CONTROL_APP"); - - if (appname.empty()) { + cerr << "Environment var for control app: " << (env_value ? env_value : "empty") << endl; + + if (!env_value) { boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend(); if (!backend) { return; } - string appname = backend->control_app_name(); + appname = backend->control_app_name(); + } else { + appname = env_value; } + cerr << "appname for control app " << appname << endl; + if (appname.empty()) { return; } @@ -827,7 +833,7 @@ EngineControl::manage_control_app_sensitivity () return; } - string appname = backend->control_app_name(); + appname = backend->control_app_name(); } else { appname = env_value; } |