--- a/edmain.cpp	Fri Oct 19 10:04:57 2012 +0300
+++ b/edmain.cpp	Fri Oct 19 15:56:59 2012 +0300
@@ -250,19 +250,12 @@
 }
 
 
-// Return audio track duration in milliseconds
-int DemoEditor::getAudioTrackDuration()
+int DemoEditor::getTimelineDuration()
 {
     return timelineAudioTrack->getDuration();
 }
 
 
-int DemoEditor::getTimelineDuration()
-{
-    return getAudioTrackDuration();
-}
-
-
 void DemoEditor::updateTimelineView()
 {
     demoView->setEngineData(&engine);    
@@ -283,7 +276,7 @@
     timelineView->setOffset(currViewOffset);
     timelineView->setScale(currViewScale);
 
-    timelineScrollBar->setRange(0, getTimelineDuration() - timelineAudioTrack->getScaledWidth());
+    timelineScrollBar->setRange(0, getTimelineDuration());
     timelineScrollBar->setValue(currViewOffset);
 }
 
@@ -403,6 +396,10 @@
         delete currTimeline;
         currTimeline = tmp;
 
+        timelineView->setTimeline(currTimeline);
+        updateTimelineView();
+        updateMenuStates();
+
         update();
         historyReset();
         changed = false;