fix over-zealous optimization in tempo map, caused crash

git-svn-id: svn://localhost/ardour2/branches/3.0@11168 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 85468b8145459dc82a6ec32104d1b29a0f695a1b..73dc99873231baea780566d9476961c6488e7d39 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -732,12 +732,6 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
        BBT_Time current;
        Metrics::iterator next_metric;
 
-       if (end == 0) {
-               /* silly call from Session::process() during startup
-                */
-               return;
-       }
-
        if (end < 0) {
 
                if (_map.empty()) {
@@ -815,6 +809,12 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
        DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add first bar at 1|1 @ %2\n", current.bars, current_frame));
        _map.push_back (BBTPoint (*meter, *tempo,(framepos_t) llrint(current_frame), 1, 1));
 
+       if (end == 0) {
+               /* silly call from Session::process() during startup
+                */
+               return;
+       }
+
        _extend_map (tempo, meter, next_metric, current, current_frame, end);
 }
 

diff --git a/wscript b/wscript
index e797a2f3ee2ccaff5497d98737ceee434d8d9119..15690996666df4153c663bbdf55c983702c8923d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ import subprocess
 import sys
 
 # Variables for 'waf dist'
-VERSION = '3.0beta1a'
+VERSION = '3.0beta2'
 APPNAME = 'Ardour3'
 
 # Mandatory variables