From baa88abad0fbb6c4ee56115c030e1472f8dc3882 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@joel-desktop.(none)>
Date: Sat, 10 Jan 2009 11:11:30 +0000
Subject: [PATCH] Further tidied and simplified update_headers

---
 .../widgets/timeline/timeline-header-container.cpp    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp
index 7641c69d2..54ad4f0f7 100644
--- a/src/gui/widgets/timeline/timeline-header-container.cpp
+++ b/src/gui/widgets/timeline/timeline-header-container.cpp
@@ -79,17 +79,12 @@ TimelineHeaderContainer::update_headers()
   pair<shared_ptr<model::Track>, shared_ptr<timeline::Track> > pair; 
   BOOST_FOREACH( pair, timelineWidget.trackMap )
     {
-      REQUIRE(pair.first);
-      
-      Widget &widget = lookup_timeline_track(pair.first)->
-        get_header_widget();
-      
-      const Container *parent = widget.get_parent();
-      if(parent == NULL)  // Is the header unparented?
+      REQUIRE(pair.second);
+      Widget &widget = pair.second->get_header_widget();
+      if(widget.get_parent() == NULL)  // Is the header unparented?
         widget.set_parent(*this);
       ENSURE(widget.get_parent() == this);
     }
-  
 }
   
 void