Don't call reset_zoom with the default frames_per_unit if we have got a different value from the Editor's state. Fixes restore of zoom level on session load.

git-svn-id: svn://localhost/ardour2/branches/3.0@7705 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-08-29 01:06:05 +00:00
parent e7587ea0fb
commit 8f093b0eaa

View File

@ -835,8 +835,6 @@ Editor::show_window ()
tv = (static_cast<TimeAxisView*>(*i));
tv->reset_height ();
}
reset_zoom (frames_per_unit);
}
present ();
@ -2419,6 +2417,8 @@ Editor::set_state (const XMLNode& node, int /*version*/)
if ((prop = node.property ("zoom"))) {
reset_zoom (PBD::atof (prop->value()));
} else {
reset_zoom (frames_per_unit);
}
if ((prop = node.property ("snap-to"))) {