X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dialogs.cc;h=cd735c5df445008754709ba8268f32484e65c895;hb=f413b83cb9fa50954969a3d849999e1890ce6690;hp=78f6d1471499eac98d29f2aec357e5a55e54921d;hpb=9c10fc5b5c438e66a2f780920e684ea9abeb49a0;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 78f6d14714..cd735c5df4 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -116,6 +116,7 @@ ARDOUR_UI::set_session (Session *s)
 	secondary_clock->set_session (s);
 	big_clock->set_session (s);
 	video_timeline->set_session (s);
+	lua_script_window->set_session (s);
 
 	/* sensitize menu bar options that are now valid */
 
@@ -223,10 +224,12 @@ ARDOUR_UI::set_session (Session *s)
 			editor_meter = new LevelMeterHBox(_session);
 			editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
 			editor_meter->clear_meters();
-			editor_meter->set_type (_session->master_out()->meter_type());
+			editor_meter->set_meter_type (_session->master_out()->meter_type());
 			editor_meter->setup_meters (30, 10, 6);
 			editor_meter->show();
 			meter_box.pack_start(*editor_meter);
+
+			editor_meter->ButtonPress.connect_same_thread (editor_meter_connection, boost::bind (&ARDOUR_UI::editor_meter_button_press, this, _1));
 		}
 
 		ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
@@ -281,6 +284,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 	}
 
 	if (hide_stuff) {
+		close_all_dialogs ();
 		editor->hide ();
 		mixer->hide ();
 		meterbridge->hide ();