Fixed some valgrind errors from using uninitialized variables in

[ardour.git] / gtk2_ardour / visual_time_axis.cc

diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc
index 582c18c86f3334bd5b1097794f74e555ab8f13eb..b6c96c55abfd5c71b6e896812354e526b08ca881 100644 (file)
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -274,12 +274,12 @@ VisualTimeAxis::remove_this_time_axis(void* src)
 
        std::string prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\n(cannot be undone)"), time_axis_name);
 
-       choices.push_back (_("Yes, remove it."));
        choices.push_back (_("No, do nothing."));
+       choices.push_back (_("Yes, remove it."));
 
        Gtkmm2ext::Choice prompter (prompt, choices);
 
-       if (prompter.run () == 0) {
+       if (prompter.run () == 1) {
                /*
                  defer to idle loop, otherwise we'll delete this object
                  while we're still inside this function ...
@@ -322,6 +322,8 @@ VisualTimeAxis::start_time_axis_rename()
        ArdourPrompter name_prompter;
 
        name_prompter.set_prompt (_("new name: ")) ;
+       name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
+       name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
        name_prompter.show_all() ;
 
        switch (name_prompter.run ()) {