Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.

git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 0 deletions

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index b9dea24313..6e0be908ae 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -678,6 +678,11 @@ LocationUI::~LocationUI()
 {
 }
 
+void LocationUI::on_show()
+{
+	ArdourDialog::on_show();
+	refresh_location_list();
+}
 
 
 gint LocationUI::do_location_remove (ARDOUR::Location *loc)
@@ -856,6 +861,9 @@ LocationUI::refresh_location_list ()
 	ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::refresh_location_list));
 	using namespace Box_Helpers;
 
+	// this is just too expensive to do when window is not shown
+	if (!is_visible()) return;
+
 	BoxList & loc_children = location_rows.children();
 	BoxList & range_children = range_rows.children();