fix all manner of wrongness with port buffer offsets

[ardour.git] / gtk2_ardour / startup.cc

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index c3d699ec2f7f2c4ddefca4c5a0894a9df524af73..9b58143746f0d4cd51834959d342da6cea12dd5f 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -156,17 +156,18 @@ ArdourStartup::set_new_only (bool yn)
 }
 
 void
-ArdourStartup::set_load_template( string load_template )
+ArdourStartup::set_load_template (string load_template)
 {
-    use_template_button.set_active( false );
-    load_template_override = load_template;
+       use_template_button.set_active (false);
+       load_template_override = load_template;
 }
 
 bool
 ArdourStartup::use_session_template ()
 {
-       if (!load_template_override.empty())
+       if (!load_template_override.empty()) {
                return true;
+       }
 
        if (use_template_button.get_active()) {
                return template_chooser.get_active_row_number() > 0;
@@ -747,9 +748,9 @@ ArdourStartup::setup_new_session_page ()
                        use_session_as_template_button.show ();
                        session_template_chooser.show ();
 
-                       Gtk::FileFilter* template_filter = manage (new (Gtk::FileFilter));
-                       template_filter->add_pattern(X_("*.template"));
-                       session_template_chooser.set_filter (*template_filter);
+                       Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter));
+                       session_filter->add_pattern (X_("*.ardour"));
+                       session_template_chooser.set_filter (*session_filter);
                        session_template_chooser.set_title (_("Select template"));
 
                        vbox3->pack_start (*hbox4b, false, false);
@@ -939,7 +940,7 @@ ArdourStartup::setup_existing_session_page ()
                hbox->set_spacing (4);
                hbox->pack_start (*manage (new Label (_("Browse:"))), PACK_SHRINK);
                hbox->pack_start (existing_session_chooser);
-               session_existing_vbox.pack_start (*hbox);
+               session_existing_vbox.pack_start (*hbox, false, false);
                hbox->show_all ();
        }