diff options
| author | Robin Gareus <robin@gareus.org> | 2017-02-20 20:47:57 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-02-20 20:47:57 +0100 |
| commit | 3a50975c3dae3759d9e7f4fdcf9a39ed4e3e69e7 (patch) | |
| tree | 5ad67653847068eb3d8672c63cc2aeb446e00285 /gtk2_ardour | |
| parent | 5f5bdca15bb86d09800dfaa53b6a57addf35eb37 (diff) | |
First-time startup logic update.
When *not* copying old config, Ardour should display the "first time"
dialog.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/startup.cc | 14 |
2 files changed, 7 insertions, 12 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index bbb27a15d0..e507370513 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -65,6 +65,7 @@ #include "pbd/localtime_r.h" #include "pbd/pthread_utils.h" #include "pbd/replace_all.h" +#include "pbd/scoped_file_descriptor.h" #include "pbd/xml++.h" #include "gtkmm2ext/application.h" @@ -324,6 +325,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) UIConfiguration::instance().post_gui_init (); if (ARDOUR::handle_old_configuration_files (boost::bind (ask_about_configuration_copy, _1, _2, _3))) { + { + /* "touch" the been-here-before path now that config has been migrated */ + PBD::ScopedFileDescriptor fout (g_open (been_here_before_path ().c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666)); + } 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/startup.cc b/gtk2_ardour/startup.cc index 12f98916bf..f332b69854 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -119,20 +119,10 @@ ArdourStartup::~ArdourStartup () bool ArdourStartup::required () { - /* look for a "been here before" file for this version or earlier - * versions - */ - const int current_version = atoi (PROGRAM_VERSION); - for (int v = current_version; v != 0; --v) { - if (Glib::file_test (ARDOUR::been_here_before_path (v), Glib::FILE_TEST_EXISTS)) { - if (v != current_version) { - /* older version exists, create the current one */ - PBD::ScopedFileDescriptor fout (g_open (been_here_before_path (current_version).c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666)); - } - return false; - } + if (Glib::file_test (ARDOUR::been_here_before_path (), Glib::FILE_TEST_EXISTS)) { + return false; } return true; |