From b426e7d5e4c2b2c0071ded015c193f78f16ead78 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 15 Nov 2011 02:06:09 +0000 Subject: [PATCH] Tidy a couple of minor things up. git-svn-id: svn://localhost/ardour2/branches/3.0@10607 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui.cc | 2 +- gtk2_ardour/editor.cc | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ed64f062c8..b4ae6131a0 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1673,7 +1673,7 @@ ARDOUR_UI::transport_record (bool roll) switch (_session->record_status()) { case Session::Disabled: if (_session->ntracks() == 0) { - MessageDialog msg (*editor, _("Please create 1 or more track\nbefore trying to record.\nCheck the Session menu.")); + MessageDialog msg (*editor, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu.")); msg.run (); return; } diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 73bc6a37c3..0fb9006716 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4696,16 +4696,15 @@ Editor::show_rhythm_ferret () void Editor::first_idle () { - MessageDialog* dialog = 0; - if (track_views.size() > 1) { - dialog = new MessageDialog (*this, - string_compose (_("Please wait while %1 loads visual data"), PROGRAM_NAME), - true, - Gtk::MESSAGE_INFO, - Gtk::BUTTONS_NONE); + MessageDialog* dialog = manage ( + new MessageDialog (*this, + string_compose (_("Please wait while %1 loads visual data."), PROGRAM_NAME), + true) + ); dialog->present (); ARDOUR_UI::instance()->flush_pending (); + delete dialog; } for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) { @@ -4715,8 +4714,6 @@ Editor::first_idle () // first idle adds route children (automation tracks), so we need to redisplay here _routes->redisplay (); - delete dialog; - _have_idled = true; } -- 2.30.2