summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-01-24 20:48:08 +0000
committerCarl Hetherington <carl@carlh.net>2012-01-24 20:48:08 +0000
commitbf8dbbaca775639b37a14cb0745e3aad4931f93e (patch)
tree0f81ab157da2508837735e28cf616b1a73721b20 /gtk2_ardour/editor.cc
parenteadc2192c576bdfc3902bb4f08f3baf4909b97b8 (diff)
Fix warning about getting tempo map for frame -1; stop
session files with left-frame=-1 causing the same problem on reload (#4654). git-svn-id: svn://localhost/ardour2/branches/3.0@11339 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r--gtk2_ardour/editor.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index c118a2ee76..9a24be433a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2243,6 +2243,9 @@ Editor::set_state (const XMLNode& node, int /*version*/)
if ((prop = node.property ("left-frame")) != 0) {
framepos_t pos;
if (sscanf (prop->value().c_str(), "%" PRId64, &pos) == 1) {
+ if (pos < 0) {
+ pos = 0;
+ }
reset_x_origin (pos);
}
}
@@ -4308,6 +4311,7 @@ Editor::idle_visual_changer ()
*/
leftmost_frame = pending_visual_change.time_origin;
+ assert (leftmost_frame >= 0);
}
if (p & VisualChange::ZoomLevel) {