diff options
author | Robin Gareus <robin@gareus.org> | 2015-03-23 18:31:55 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-03-23 18:31:55 +0100 |
commit | 53ac99a26ad5e16406dd203445d578ded913f6a9 (patch) | |
tree | dee97a659f55b2fec4f875d2144781ea752ef313 /gtk2_ardour | |
parent | a09e942eeca9c0b2be808ee9492808fe7b377577 (diff) |
rework check for old configuration files
check early on (before announcement-check, bundle-
env and ARDOUR_UI ctor have a chance to create the
new config dir)
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/bundle_env_linux.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/main.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 0c73609f3c..443bba7057 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -238,7 +238,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) { Gtkmm2ext::init(localedir); - if (ARDOUR::check_for_old_configuration_files (boost::bind (ask_about_configuration_copy, _1, _2, _3))) { + if (ARDOUR::handle_old_configuration_files (boost::bind (ask_about_configuration_copy, _1, _2, _3))) { MessageDialog msg (string_compose (_("Your configuration files were copied. You can now restart %1."), PROGRAM_NAME), true); msg.run (); /* configuration was modified, exit immediately */ diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc index a7027506fe..54404b14fb 100644 --- a/gtk2_ardour/bundle_env_linux.cc +++ b/gtk2_ardour/bundle_env_linux.cc @@ -60,7 +60,6 @@ fixup_bundle_environment (int /*argc*/, char* argv[], const char** localedir) std::string path; std::string dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0])); - std::string userconfigdir = user_config_directory(); #ifdef ENABLE_NLS if (!ARDOUR::translations_are_enabled ()) { diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 998337ed09..42f94522c2 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -251,6 +251,8 @@ int ardour_main (int argc, char *argv[]) int main (int argc, char *argv[]) #endif { + ARDOUR::check_for_old_configuration_files(); + fixup_bundle_environment (argc, argv, &localedir); load_custom_fonts(); /* needs to happen before any gtk and pango init calls */ |