summaryrefslogtreecommitdiff
path: root/gtk2_ardour/main.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-03-17 17:39:21 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-03-17 17:39:21 +0000
commit5e836403adcb62a59141226baa32515ae7789661 (patch)
tree40e47327306f1328f504ce16b81981206572af5d /gtk2_ardour/main.cc
parent6097ce578b9dc4d51f421c2e4cca2de64948aa66 (diff)
lots of fidgety work to get track renaming to work correctly now that we have to rename audio files too; some GUI tweaks
git-svn-id: svn://localhost/trunk/ardour2@404 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/main.cc')
-rw-r--r--gtk2_ardour/main.cc15
1 files changed, 11 insertions, 4 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 14330e2009..028c38ac74 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -239,11 +239,18 @@ string
which_ui_rcfile ()
{
string rcfile;
+ char* env;
+
+ if ((env = getenv ("ARDOUR2_UI_RC")) != 0 && strlen (env)) {
+ rcfile = env;
+ } else {
+ rcfile = "ardour2_ui.rc";
+ }
+
+ rcfile = find_config_file (rcfile);
- rcfile = find_config_file ("ardour2_ui.rc");
-
- if (rcfile.length() == 0) {
- warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR_UI_RC to point to a valid UI style file") << endmsg;
+ if (rcfile.empty()) {
+ warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR2_UI_RC to point to a valid UI style file") << endmsg;
}
return rcfile;