Repair thinko in previous commit.

[ardour.git] / gtk2_ardour / startup.cc

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 37e62ca04f72d1272d9389c99f55bf639e9bbf14..a7bce0a8479c3232165c63481534cebad65a18ad 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -121,13 +121,11 @@ Ardour will play NO role in monitoring"))
                set_default_icon_list (window_icons);
        }
 
-       sys::path been_here_before = user_config_directory();
-       been_here_before /= ".a3"; // XXXX use more specific version so we can catch upgrades
-       new_user = !exists (been_here_before);
+       new_user = !exists (been_here_before_path ());
 
        bool need_audio_setup = !EngineControl::engine_running();
 
-        setup_alpha_page ();
+        setup_prerelease_page ();
 
        if (new_user) {
 
@@ -141,8 +139,6 @@ Ardour will play NO role in monitoring"))
                        error << "Could not create user configuration directory" << endmsg;
                }
                
-               /* "touch" the file */
-               ofstream fout (been_here_before.to_string().c_str());
                setup_new_user_page ();
                setup_first_time_config_page ();
                setup_monitoring_choice_page ();
@@ -176,12 +172,12 @@ ArdourStartup::~ArdourStartup ()
 }
 
 void
-ArdourStartup::setup_alpha_page ()
+ArdourStartup::setup_prerelease_page ()
 {
         VBox* vbox = manage (new VBox);
         Label* label = manage (new Label);
-        label->set_markup (_("<b>Welcome to this ALPHA release of Ardour 3.0</b>\n\n\
-There are still many issues and bugs to be worked on,\n\
+        label->set_markup (_("<b>Welcome to this BETA release of Ardour 3.0</b>\n\n\
+There are still several issues and bugs to be worked on,\n\
 as well as general workflow improvements, before this can be considered\n\
 release software. So, a few guidelines:\n\
 \n\
@@ -206,7 +202,7 @@ Full information on all the above can be found on the support page at\n\
 
         append_page (*vbox);
         set_page_type (*vbox, ASSISTANT_PAGE_CONTENT);
-        set_page_title (*vbox, _("This is an ALPHA RELEASE"));
+        set_page_title (*vbox, _("This is an BETA RELEASE"));
        set_page_complete (*vbox, true);
 }
 
@@ -645,6 +641,9 @@ ArdourStartup::on_apply ()
 
                Config->set_use_monitor_bus (use_monitor_section_button.get_active());
 
+               /* "touch" the been-here-before path now that we're about to save Config */
+               ofstream fout (been_here_before_path().to_string().c_str());
+               
                Config->save_state ();
        }
 
@@ -1378,3 +1377,12 @@ ArdourStartup::existing_session_selected ()
        set_page_complete (session_vbox, true);
        move_along_now ();
 }
+
+sys::path
+ArdourStartup::been_here_before_path () const
+{
+       sys::path b = user_config_directory();
+       b /= ".a3"; // XXXX use more specific version so we can catch upgrades
+       return b;
+}
+