diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-08-29 01:06:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-08-29 01:06:05 +0000 |
| commit | 8f093b0eaa91e0e07128e3e906c727ce5e379ab2 (patch) | |
| tree | ac64504734b190c98d8e60f7f1f72b2a9f542d28 /gtk2_ardour | |
| parent | e7587ea0fbaf6aab5db7387b9c12a0fd956c8ec3 (diff) | |
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
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 47743773f7..076ae2140e 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -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"))) { |